diff --git a/.env.example b/.env.example
index cd29496..c63d0bb 100644
--- a/.env.example
+++ b/.env.example
@@ -3,11 +3,17 @@ LDAP_PORT=389
 LDAP_ADMIN_PASSWORD=passthebutter
 LDAP_SUFFIX="dc=kosmos,dc=org"
 
+WEBHOOKS_ALLOWED_IPS='10.1.1.163'
+
 EJABBERD_API_URL='https://xmpp.kosmos.org/api'
 
 BTCPAY_API_URL='http://localhost:23001/api/v1'
 
 LNDHUB_API_URL='http://localhost:3023'
 LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
-
-WEBHOOKS_ALLOWED_IPS='10.1.1.163'
+LNDHUB_ADMIN_UI=true
+LNDHUB_PG_HOST=localhost
+LNDHUB_PG_PORT=5432
+LNDHUB_PG_DATABASE=lndhub
+LNDHUB_PG_USERNAME=lndhub
+LNDHUB_PG_PASSWORD=''
diff --git a/.env.production b/.env.production
deleted file mode 100644
index d99e4fe..0000000
--- a/.env.production
+++ /dev/null
@@ -1,9 +0,0 @@
-EJABBERD_API_URL='https://xmpp.kosmos.org:5443/api'
-
-BTCPAY_API_URL='http://10.1.1.163:23001/api/v1'
-
-LNDHUB_LEGACY_API_URL='http://10.1.1.163:3026'
-LNDHUB_API_URL='http://10.1.1.163:3026'
-LNDHUB_PUBLIC_URL='https://lndhub.kosmos.org'
-
-WEBHOOKS_ALLOWED_IPS='10.1.1.163'
diff --git a/config/database.yml b/config/database.yml
index 49b5c31..bac8f50 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,9 +13,15 @@ development:
   primary:
     <<: *default
     database: db/development.sqlite3
-  # lndhub:
-  #   <<: *default
-  #   database: db/lndhub.sqlite3
+  lndhub:
+    <<: *default
+    adapter: postgresql
+    database_tasks: false
+    host: <%= ENV.fetch("LNDHUB_PG_HOST") { 'localhost' } %>
+    port: <%= ENV.fetch("LNDHUB_PG_PORT") { 5432 } %>
+    database: <%= ENV.fetch("LNDHUB_PG_DATABASE") { 'lndhub' } %>
+    username: <%= ENV.fetch("LNDHUB_PG_USERNAME") { 'lndhub' } %>
+    password: <%= ENV.fetch("LNDHUB_PG_PASSWORD") %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -42,8 +48,8 @@ production:
     <<: *default
     adapter: postgresql
     database_tasks: false
-    database: lndhub
-    port: 5432
-    host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
-    username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
-    password: <%= Rails.application.credentials.postgres[:password] rescue nil %>
+    host: <%= ENV.fetch("LNDHUB_PG_HOST") { 'localhost' } %>
+    port: <%= ENV.fetch("LNDHUB_PG_PORT") { 5432 } %>
+    database: <%= ENV.fetch("LNDHUB_PG_DATABASE") { 'lndhub' } %>
+    username: <%= ENV.fetch("LNDHUB_PG_USERNAME") { 'lndhub' } %>
+    password: <%= ENV.fetch("LNDHUB_PG_PASSWORD") %>