diff --git a/salt/electrum/README.md b/salt/electrum/README.md
index a636d895..64154a2b 100644
--- a/salt/electrum/README.md
+++ b/salt/electrum/README.md
@@ -35,7 +35,7 @@ usage from ever connecting to the internet.
 
 ```sh
 sudo qubesctl top.enable electrum
-sudo qubesctl --targets=tpl-electrum-builder,tpl-electrum,disp-electrum-builder,electrum,electrum-hot state.apply
+sudo qubesctl --targets=sys-bitcoin-gateway,tpl-electrum-builder,tpl-electrum,disp-electrum-builder,electrum,electrum-hot state.apply
 sudo qubesctl top.disable electrum
 sudo qubesctl state.apply electrum.appmenus
 ```
@@ -46,6 +46,7 @@ sudo qubesctl state.apply electrum.appmenus
 
 ```sh
 sudo qubesctl state.apply electrum.create
+sudo qubesctl --skip-dom0 --targets=sys-bitcoin-gateway state.apply sys-bitcoin.configure-gateway
 sudo qubesctl --skip-dom0 --targets=tpl-electrum-builder state.apply electrum.install-builder
 sudo qubesctl --skip-dom0 --targets=tpl-electrum state.apply electrum.install
 sudo qubesctl --skip-dom0 --targets=disp-electrum-builder state.apply electrum.configure-builder
diff --git a/salt/electrum/init.top b/salt/electrum/init.top
index c2dce5f2..e0f8dfb9 100644
--- a/salt/electrum/init.top
+++ b/salt/electrum/init.top
@@ -8,6 +8,8 @@ base:
   'dom0':
     - match: nodegroup
     - electrum.create
+  'sys-bitcoin-gateway':
+    - sys-bitcoin.configure-gateway
   'tpl-electrum-builder':
     - electrum.install-builder
   'tpl-electrum':
diff --git a/salt/sys-electrs/README.md b/salt/sys-electrs/README.md
index 31e91dae..97a4f6e3 100644
--- a/salt/sys-electrs/README.md
+++ b/salt/sys-electrs/README.md
@@ -30,7 +30,7 @@ This formula depends on [sys-bitcoin](../sys-bitcoin/README.md).
 
 ```sh
 sudo qubesctl top.enable sys-electrs
-sudo qubesctl --targets=tpl-electrs-builder,tpl-sys-electrs,disp-electrs-builder,sys-electrs state.apply
+sudo qubesctl --targets=sys-bitcoin-gateway,tpl-electrs-builder,tpl-sys-electrs,disp-electrs-builder,sys-electrs state.apply
 sudo qubesctl top.disable sys-electrs
 sudo qubesctl state.apply sys-electrs.appmenus
 ```
@@ -41,6 +41,7 @@ sudo qubesctl state.apply sys-electrs.appmenus
 
 ```sh
 sudo qubesctl state.apply sys-electrs.create
+sudo qubesctl --skip-dom0 --targets=sys-bitcoin-gateway state.apply sys-bitcoin.configure-gateway
 sudo qubesctl --skip-dom0 --targets=tpl-electrs-builder state.apply sys-electrs.install-builder
 sudo qubesctl --skip-dom0 --targets=tpl-sys-electrs state.apply sys-electrs.install
 sudo qubesctl --skip-dom0 --targets=disp-electrs-builder state.apply sys-electrs.configure-builder
diff --git a/salt/sys-electrs/init.top b/salt/sys-electrs/init.top
index 9799c835..e63dd7dc 100644
--- a/salt/sys-electrs/init.top
+++ b/salt/sys-electrs/init.top
@@ -8,6 +8,8 @@ base:
   'dom0':
     - match: nodegroup
     - sys-electrs.create
+  'sys-bitcoin-gateway':
+    - sys-bitcoin.configure-gateway
   'tpl-electrs-builder':
     - sys-electrs.install-builder
   'tpl-sys-electrs':
diff --git a/salt/sys-electrumx/README.md b/salt/sys-electrumx/README.md
index 1ded5da4..4643e90d 100644
--- a/salt/sys-electrumx/README.md
+++ b/salt/sys-electrumx/README.md
@@ -30,7 +30,7 @@ This formula depends on [sys-bitcoin](../sys-bitcoin/README.md).
 
 ```sh
 sudo qubesctl top.enable sys-electrumx
-sudo qubesctl --targets=tpl-electrumx-builder,tpl-sys-electrumx,disp-electrumx-builder,sys-electrumx state.apply
+sudo qubesctl --targets=sys-bitcoin-gateway,tpl-electrumx-builder,tpl-sys-electrumx,disp-electrumx-builder,sys-electrumx state.apply
 sudo qubesctl top.disable sys-electrumx
 sudo qubesctl state.apply sys-electrumx.appmenus
 ```
@@ -41,6 +41,7 @@ sudo qubesctl state.apply sys-electrumx.appmenus
 
 ```sh
 sudo qubesctl state.apply sys-electrumx.create
+sudo qubesctl --skip-dom0 --targets=sys-bitcoin-gateway state.apply sys-bitcoin.configure-gateway
 sudo qubesctl --skip-dom0 --targets=tpl-electrumx-builder state.apply sys-electrumx.install-builder
 sudo qubesctl --skip-dom0 --targets=tpl-sys-electrumx state.apply sys-electrumx.install
 sudo qubesctl --skip-dom0 --targets=disp-electrumx-builder state.apply sys-electrumx.configure-builder
diff --git a/salt/sys-electrumx/init.top b/salt/sys-electrumx/init.top
index 2d15a3f8..df733d7f 100644
--- a/salt/sys-electrumx/init.top
+++ b/salt/sys-electrumx/init.top
@@ -8,6 +8,8 @@ base:
   'dom0':
     - match: nodegroup
     - sys-electrumx.create
+  'sys-bitcoin-gateway':
+    - sys-bitcoin.configure-gateway
   'tpl-electrumx-builder':
     - sys-electrumx.install-builder
   'tpl-sys-electrumx':