diff --git a/nodes/bitcoin-2.json b/nodes/bitcoin-2.json
index 0e458c8..6411721 100644
--- a/nodes/bitcoin-2.json
+++ b/nodes/bitcoin-2.json
@@ -101,16 +101,11 @@
   "run_list": [
     "role[base]",
     "role[kvm_guest]",
-    "role[postgresql_client]",
     "recipe[tor-full]",
-    "recipe[kosmos-bitcoin::source]",
-    "recipe[kosmos-bitcoin::c-lightning]",
-    "recipe[kosmos-bitcoin::lnd]",
-    "recipe[kosmos-bitcoin::lnd-scb-s3]",
-    "recipe[kosmos-bitcoin::boltz]",
-    "recipe[kosmos-bitcoin::rtl]",
-    "recipe[kosmos-bitcoin::lndhub]",
-    "recipe[kosmos-bitcoin::lndhub-go]",
+    "role[bitcoind]",
+    "role[cln]",
+    "role[lnd]",
+    "role[lndhub]",
     "role[btcpay]"
   ]
-}
\ No newline at end of file
+}
diff --git a/roles/bitcoind.rb b/roles/bitcoind.rb
new file mode 100644
index 0000000..d786e4f
--- /dev/null
+++ b/roles/bitcoind.rb
@@ -0,0 +1,5 @@
+name "bitcoind"
+
+run_list %w(
+  kosmos-bitcoin::source
+)
diff --git a/roles/cln.rb b/roles/cln.rb
new file mode 100644
index 0000000..b75b75f
--- /dev/null
+++ b/roles/cln.rb
@@ -0,0 +1,5 @@
+name "cln"
+
+run_list %w(
+  kosmos-bitcoin::c-lightning
+)
diff --git a/roles/lnd.rb b/roles/lnd.rb
new file mode 100644
index 0000000..85f5f9e
--- /dev/null
+++ b/roles/lnd.rb
@@ -0,0 +1,8 @@
+name "lnd"
+
+run_list %w(
+  kosmos-bitcoin::lnd
+  kosmos-bitcoin::lnd-scb-s3
+  kosmos-bitcoin::boltz
+  kosmos-bitcoin::rtl
+)
diff --git a/roles/lndhub.rb b/roles/lndhub.rb
new file mode 100644
index 0000000..6f67d07
--- /dev/null
+++ b/roles/lndhub.rb
@@ -0,0 +1,7 @@
+name "lndhub"
+
+run_list %w(
+  role[postgresql_client]
+  kosmos-bitcoin::lndhub
+  kosmos-bitcoin::lndhub-go
+)
diff --git a/roles/nginx_proxy.rb b/roles/nginx_proxy.rb
index 0edd22b..9aa9cc9 100644
--- a/roles/nginx_proxy.rb
+++ b/roles/nginx_proxy.rb
@@ -18,18 +18,19 @@ default_run_list = %w(
   kosmos_assets::nginx_site
   kosmos_discourse::nginx
   kosmos_drone::nginx
+  kosmos_garage::default
+  kosmos_garage::firewall_rpc
+  kosmos_garage::nginx_web
   kosmos_gitea::nginx
   kosmos_website::default
   kosmos-akkounts::nginx_api
+  kosmos-bitcoin::nginx_lndhub
   kosmos-ejabberd::nginx
   kosmos-hubot::nginx_botka_irc-libera-chat
   kosmos-hubot::nginx_hal8000_xmpp
   kosmos-ipfs::nginx_public_gateway
   kosmos-mastodon::nginx
   remotestorage_discourse::nginx
-  kosmos_garage::default
-  kosmos_garage::firewall_rpc
-  kosmos_garage::nginx_web
 )
 
 env_run_lists(