diff --git a/scripts/configure b/scripts/configure
index fc9b5fc..498f81a 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -248,6 +248,10 @@ elif BITCOIN_NETWORK == "regtest":
 else:
   exit(1)
 
+NETWORK_SECTION=""
+if BITCOIN_NETWORK != "mainnet":
+  NETWORK_SECTION = "[{}]".format(BITCOIN_NETWORK)
+
 # IP addresses for services
 NETWORK_IP="10.21.21.0"
 GATEWAY_IP="10.21.21.1"
diff --git a/templates/bitcoin-sample.conf b/templates/bitcoin-sample.conf
index 6dca551..6d131db 100644
--- a/templates/bitcoin-sample.conf
+++ b/templates/bitcoin-sample.conf
@@ -3,7 +3,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-# Please note: This file can't be changed, it will be overwritten.
+# Please note: This file can't be changed, any changes will be overwritten the next time you start Citadel.
+
 # Tor
 proxy=<tor-proxy-ip>:<tor-proxy-port>
 listen=1
@@ -13,10 +14,6 @@ bind=<bitcoin-ip>
 <bitcoin-network>=1
 
 # Connections
-port=<bitcoin-p2p-port>
-rpcport=<bitcoin-rpc-port>
-rpcbind=<bitcoin-ip>
-rpcbind=127.0.0.1
 rpcallowip=<gateway-ip>/16
 rpcallowip=127.0.0.1
 rpcauth=<bitcoin-rpc-auth>
@@ -43,3 +40,9 @@ peerblockfilters=1
 <knots-reindex-auto>
 
 <external-ip>
+
+<network-section>
+port=<bitcoin-p2p-port>
+rpcport=<bitcoin-rpc-port>
+rpcbind=<bitcoin-ip>
+rpcbind=127.0.0.1