diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json
index 8645317..3c9e8d7 100644
--- a/nodes/ejabberd-4.json
+++ b/nodes/ejabberd-4.json
@@ -12,7 +12,9 @@
     "hostname": "ejabberd-4",
     "ipaddress": "192.168.122.39",
     "roles": [
+      "base",
       "kvm_guest",
+      "ldap_client",
       "ejabberd",
       "postgresql_client"
     ],
@@ -20,6 +22,7 @@
       "kosmos-base",
       "kosmos-base::default",
       "kosmos_kvm::guest",
+      "kosmos-dirsrv::hostsfile",
       "kosmos_postgresql::hostsfile",
       "kosmos-ejabberd::letsencrypt",
       "kosmos-ejabberd",
@@ -39,7 +42,6 @@
       "postfix::sasl_auth",
       "hostname::default",
       "kosmos-base::letsencrypt",
-      "kosmos-dirsrv::hostsfile",
       "kosmos-ejabberd::firewall",
       "tor-full::default"
     ],
@@ -64,4 +66,4 @@
     "role[ldap_client]",
     "role[ejabberd]"
   ]
-}
+}
\ No newline at end of file
diff --git a/nodes/ejabberd-8.json b/nodes/ejabberd-8.json
index f06d5a6..d684b24 100644
--- a/nodes/ejabberd-8.json
+++ b/nodes/ejabberd-8.json
@@ -12,12 +12,17 @@
     "hostname": "ejabberd-8",
     "ipaddress": "192.168.122.27",
     "roles": [
+      "base",
+      "kvm_guest",
+      "ldap_client",
       "ejabberd",
       "postgresql_client"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
+      "kosmos_kvm::guest",
+      "kosmos-dirsrv::hostsfile",
       "kosmos_postgresql::hostsfile",
       "kosmos-ejabberd::letsencrypt",
       "kosmos-ejabberd",
@@ -37,7 +42,6 @@
       "postfix::sasl_auth",
       "hostname::default",
       "kosmos-base::letsencrypt",
-      "kosmos-dirsrv::hostsfile",
       "kosmos-ejabberd::firewall",
       "tor-full::default"
     ],
@@ -62,4 +66,4 @@
     "role[ldap_client]",
     "role[ejabberd]"
   ]
-}
+}
\ No newline at end of file
diff --git a/site-cookbooks/kosmos-bitcoin/recipes/lndhub-go.rb b/site-cookbooks/kosmos-bitcoin/recipes/lndhub-go.rb
index c924c4e..c1df583 100644
--- a/site-cookbooks/kosmos-bitcoin/recipes/lndhub-go.rb
+++ b/site-cookbooks/kosmos-bitcoin/recipes/lndhub-go.rb
@@ -21,9 +21,10 @@ postgres_port = node['lndhub-go']['postgres']['port']
 
 begin
   akkounts_host = search(:node, "role:akkounts").first["knife_zero"]["host"]
-  node['lndhub-go']['webhook_url'] = "http://#{akkounts_host}:3000/webhooks/lndhub"
-rescue
-  # No akkounts host found
+  node.normal['lndhub-go']['webhook_url'] = "http://#{akkounts_host}:3000/webhooks/lndhub"
+rescue => e
+  puts "NO AKKOUNTS HOST FOUND"
+  puts e.message
 end
 
 git source_dir do
diff --git a/site-cookbooks/kosmos-bitcoin/templates/lndhub-go.env.erb b/site-cookbooks/kosmos-bitcoin/templates/lndhub-go.env.erb
index 5fd3936..4b1faa5 100644
--- a/site-cookbooks/kosmos-bitcoin/templates/lndhub-go.env.erb
+++ b/site-cookbooks/kosmos-bitcoin/templates/lndhub-go.env.erb
@@ -4,6 +4,8 @@
 <%= "#{key.upcase}_#{k.upcase}" %>=<%= v.to_s %>
 <% end %>
 <% else %>
+<% if value %>
 <%= key.upcase %>=<%= value.to_s %>
 <% end %>
 <% end %>
+<% end %>