diff --git a/bitfeed/docker-compose.yml b/bitfeed/docker-compose.yml
index 697fcf8..b6337ed 100644
--- a/bitfeed/docker-compose.yml
+++ b/bitfeed/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_BITFEED_IP
+      APP_HOST: bitfeed_web_1
       APP_PORT: 80
 
   web:
@@ -14,11 +14,8 @@ services:
       - "api"
     environment:
       TARGET: "umbrel"
-      BACKEND_HOST: "$APP_BITFEED_API_IP"
-      BACKEND_PORT: "$APP_BITFEED_API_PORT"
-    networks:
-      default:
-        ipv4_address: $APP_BITFEED_IP
+      BACKEND_HOST: bitfeed_api_1
+      BACKEND_PORT: 8315
 
   api:
     image: ghcr.io/bitfeed-project/bitfeed-server:v2.3.4@sha256:e38a2e07389cf6d0c519e856291e535fdd10a1e50143d528c82bfe0baf06894f
@@ -26,7 +23,7 @@ services:
     restart: on-failure
     stop_grace_period: 1m
     environment:
-      PORT: "$APP_BITFEED_API_PORT"
+      PORT: 8315
       BITCOIN_HOST: "$APP_BITCOIN_NODE_IP"
       BITCOIN_ZMQ_RAWTX_PORT: "$APP_BITCOIN_ZMQ_RAWTX_PORT"
       BITCOIN_ZMQ_RAWBLOCK_PORT: "$APP_BITCOIN_ZMQ_RAWBLOCK_PORT"
@@ -40,6 +37,3 @@ services:
       LOG_LEVEL: "info"
     volumes:
       - ${APP_DATA_DIR}/data:/app/data
-    networks:
-      default:
-        ipv4_address: $APP_BITFEED_API_IP
diff --git a/bitfeed/exports.sh b/bitfeed/exports.sh
deleted file mode 100644
index d980b79..0000000
--- a/bitfeed/exports.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export APP_BITFEED_IP="10.21.21.68"
-export APP_BITFEED_PORT="8314"
-export APP_BITFEED_API_IP="10.21.21.69"
-export APP_BITFEED_API_PORT="8315"
\ No newline at end of file
diff --git a/bleskomat-server/docker-compose.yml b/bleskomat-server/docker-compose.yml
index da8257f..b9f1ed7 100644
--- a/bleskomat-server/docker-compose.yml
+++ b/bleskomat-server/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_BLESKOMAT_SERVER_IP
-      APP_PORT: $APP_BLESKOMAT_SERVER_PORT
+      APP_HOST: bleskomat-server_web_1
+      APP_PORT: 3333
       PROXY_AUTH_ADD: "false"
 
   db:
@@ -14,9 +14,6 @@ services:
     stop_grace_period: 1m
     volumes:
         - $APP_DATA_DIR/data/db:/var/lib/postgresql/data
-    networks:
-      default:
-        ipv4_address: $APP_BLESKOMAT_SERVER_DB_IP
     environment:
       - POSTGRES_USER=bleskomat_server
       - POSTGRES_DB=bleskomat_server
@@ -35,17 +32,13 @@ services:
     environment:
       DEBUG: "bleskomat-server*,lnurl*"
       BLESKOMAT_SERVER_HOST: "0.0.0.0"
-      BLESKOMAT_SERVER_PORT: "$APP_BLESKOMAT_SERVER_PORT"
+      BLESKOMAT_SERVER_PORT: 3333
       BLESKOMAT_SERVER_URL: "$APP_HIDDEN_SERVICE"
       BLESKOMAT_SERVER_ENDPOINT: "/u"
       BLESKOMAT_SERVER_AUTH_API_KEYS: '[]'
       BLESKOMAT_SERVER_LIGHTNING: '{"backend":"lnd","config":{"cert":"/lnd/tls.cert","protocol":"https","hostname":"$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT","macaroon":"/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"}}'
-      BLESKOMAT_SERVER_STORE: '{"backend":"knex","config":{"client":"postgres","connection":{"host":"$APP_BLESKOMAT_SERVER_DB_IP","port":5432,"user":"bleskomat_server","password":"moneyprintergobrrr","database":"bleskomat_server"}}}'
+      BLESKOMAT_SERVER_STORE: '{"backend":"knex","config":{"client":"postgres","connection":{"host":"bleskomat-server_db_1","port":5432,"user":"bleskomat_server","password":"moneyprintergobrrr","database":"bleskomat_server"}}}'
       BLESKOMAT_SERVER_COINRATES_DEFAULTS_PROVIDER: "coinbase"
       BLESKOMAT_SERVER_ADMIN_WEB: "true"
       BLESKOMAT_SERVER_ADMIN_PASSWORD_PLAINTEXT: "$APP_PASSWORD"
       BLESKOMAT_SERVER_ENV_FILEPATH: "./data/.env"
-
-    networks:
-      default:
-        ipv4_address: $APP_BLESKOMAT_SERVER_IP
diff --git a/bleskomat-server/exports.sh b/bleskomat-server/exports.sh
deleted file mode 100644
index ff28c70..0000000
--- a/bleskomat-server/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_BLESKOMAT_SERVER_PORT="3333"
-export APP_BLESKOMAT_SERVER_IP="10.21.21.85"
-export APP_BLESKOMAT_SERVER_DB_IP="10.21.21.86"
\ No newline at end of file
diff --git a/bluewallet/docker-compose.yml b/bluewallet/docker-compose.yml
index 0bbb6d4..6de3a4a 100644
--- a/bluewallet/docker-compose.yml
+++ b/bluewallet/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_BLUEWALLET_LNDHUB_IP
-      APP_PORT: $APP_BLUEWALLET_LNDHUB_PORT
+      APP_HOST: bluewallet_lndhub_1
+      APP_PORT: 3008
       PROXY_AUTH_ADD: "false"
 
   redis:
@@ -16,9 +16,6 @@ services:
     init: true
     volumes:
       - "${APP_DATA_DIR}/data/redis:/data"
-    networks:
-      default:
-        ipv4_address: "${APP_BLUEWALLET_REDIS_IP}"
 
   lndhub:
     image: "bluewalletorganization/lndhub:v1.4.1@sha256:db673a8d360982984d05f97303e26dc0e5a3eea36ba54d0abdae5bbbeef31d3a"
@@ -30,11 +27,8 @@ services:
     volumes:
       - "${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro"
     environment:
-      PORT: "${APP_BLUEWALLET_LNDHUB_PORT}"
+      PORT: 3008
       TOR_URL: "${APP_HIDDEN_SERVICE}"
       LND_CERT_FILE: "/lnd/tls.cert"
       LND_ADMIN_MACAROON_FILE: "/lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/admin.macaroon"
-      CONFIG: '{ "rateLimit": 10000, "postRateLimit": 10000, "redis": { "port": 6379, "host": "$APP_BLUEWALLET_REDIS_IP", "family": 4, "password": "moneyprintergobrrr", "db": 0 }, "lnd": { "url": "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT", "password": ""}}'
-    networks:
-      default:
-        ipv4_address: "${APP_BLUEWALLET_LNDHUB_IP}"
+      CONFIG: '{ "rateLimit": 10000, "postRateLimit": 10000, "redis": { "port": 6379, "host": "bluewallet_redis_1", "family": 4, "password": "moneyprintergobrrr", "db": 0 }, "lnd": { "url": "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT", "password": ""}}'
diff --git a/bluewallet/exports.sh b/bluewallet/exports.sh
deleted file mode 100644
index 1607ad6..0000000
--- a/bluewallet/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_BLUEWALLET_LNDHUB_IP="10.21.21.30"
-export APP_BLUEWALLET_LNDHUB_PORT="3008"
-export APP_BLUEWALLET_REDIS_IP="10.21.21.31"
\ No newline at end of file
diff --git a/btcpay-server/docker-compose.yml b/btcpay-server/docker-compose.yml
index 86f7624..5293e07 100644
--- a/btcpay-server/docker-compose.yml
+++ b/btcpay-server/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_BTCPAY_SERVER_IP
-      APP_PORT: $APP_BTCPAY_SERVER_PORT
+      APP_HOST: btcpay-server_web_1
+      APP_PORT: 3003
       PROXY_AUTH_ADD: "false"
 
   nbxplorer:
@@ -25,12 +25,9 @@ services:
       NBXPLORER_BTCNODEENDPOINT: $APP_BITCOIN_NODE_IP:$APP_BITCOIN_P2P_PORT
       NBXPLORER_BTCRPCUSER: $APP_BITCOIN_RPC_USER
       NBXPLORER_BTCRPCPASSWORD: $APP_BITCOIN_RPC_PASS
-      NBXPLORER_POSTGRES: User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
+      NBXPLORER_POSTGRES: User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
       NBXPLORER_AUTOMIGRATE: 1
       NBXPLORER_NOMIGRATEEVTS: 1
-    networks:
-      default:
-        ipv4_address: $APP_BTCPAY_SERVER_NBXPLORER_IP
 
   web:
     image: btcpayserver/btcpayserver:1.6.12@sha256:41768be32374ebc4f64050ad5e56ffef8834ccacbff0440c0938a493abcec252
@@ -48,17 +45,14 @@ services:
       BTCPAY_DATADIR: "/data"
       BTCPAY_PLUGINDIR: "/data/plugins"
       BTCPAY_DOCKERDEPLOYMENT: "false"
-      BTCPAY_POSTGRES: "User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Database=btcpayserver$APP_BITCOIN_NETWORK"
+      BTCPAY_POSTGRES: "User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Database=btcpayserver$APP_BITCOIN_NETWORK"
       BTCPAY_NETWORK: "$APP_BITCOIN_NETWORK"
-      BTCPAY_BIND: 0.0.0.0:$APP_BTCPAY_SERVER_PORT
+      BTCPAY_BIND: 0.0.0.0:3003
       BTCPAY_CHAINS: "btc"
-      BTCPAY_BTCEXPLORERURL: "http://$APP_BTCPAY_SERVER_NBXPLORER_IP:32838"
+      BTCPAY_BTCEXPLORERURL: "http://btcpay-server_nbxplorer_1:32838"
       BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT/;macaroonfilepath=/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon;allowinsecure=true"
       BTCPAY_SOCKSENDPOINT: $TOR_PROXY_IP:$TOR_PROXY_PORT
-      BTCPAY_EXPLORERPOSTGRES: User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
-    networks:
-      default:
-        ipv4_address: $APP_BTCPAY_SERVER_IP
+      BTCPAY_EXPLORERPOSTGRES: User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
 
   postgres:
     image: btcpayserver/postgres:13.7@sha256:dadf0048895a888d88a2dd773dde2f5868c45f74ad37c6d208694df54b590531
@@ -72,6 +66,3 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
     volumes:
       - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
-    networks:
-      default:
-        ipv4_address: $APP_BTCPAY_SERVER_DB_IP
diff --git a/btcpay-server/exports.sh b/btcpay-server/exports.sh
deleted file mode 100644
index e3d5491..0000000
--- a/btcpay-server/exports.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export APP_BTCPAY_SERVER_IP="10.21.21.19"
-export APP_BTCPAY_SERVER_PORT="3003"
-export APP_BTCPAY_SERVER_NBXPLORER_IP="10.21.21.20"
-export APP_BTCPAY_SERVER_DB_IP="10.21.21.21"
\ No newline at end of file
diff --git a/calibre-web/docker-compose.yml b/calibre-web/docker-compose.yml
index aed37a2..4a38571 100644
--- a/calibre-web/docker-compose.yml
+++ b/calibre-web/docker-compose.yml
@@ -1,13 +1,13 @@
-version: "2.1"
+version: "3.7"
+
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_CALIBRE_WEB_IP
-      APP_PORT: $APP_CALIBRE_WEB_PORT
+      APP_HOST: calibre-web_server_1
+      APP_PORT: 8083
 
-  calibre-web:
+  server:
     image: linuxserver/calibre-web:0.6.19@sha256:898987a2276b7f175f9ae787ef2b7f3f91103a3e621dffe7b67b3a9feae1b922
-    container_name: calibre-web
     stop_grace_period: 1m
     environment:
       - PUID=1000
@@ -16,6 +16,3 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${APP_DATA_DIR}/data/books:/books
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_CALIBRE_WEB_IP
diff --git a/calibre-web/exports.sh b/calibre-web/exports.sh
deleted file mode 100644
index f88c1fb..0000000
--- a/calibre-web/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_CALIBRE_WEB_IP="10.21.21.106"
-export APP_CALIBRE_WEB_PORT="8083"
diff --git a/code-server/docker-compose.yml b/code-server/docker-compose.yml
index 147b862..de83a9a 100644
--- a/code-server/docker-compose.yml
+++ b/code-server/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_CODE_SERVER_IP
+      APP_HOST: code-server_server_1
       APP_PORT: 8080
 
   server:
@@ -14,6 +14,3 @@ services:
       - ${APP_DATA_DIR}/data:/home/coder
     environment:
       PASSWORD: $APP_PASSWORD
-    networks:
-      default:
-        ipv4_address: $APP_CODE_SERVER_IP
diff --git a/code-server/exports.sh b/code-server/exports.sh
deleted file mode 100644
index 7f9fd7a..0000000
--- a/code-server/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_CODE_SERVER_IP="10.21.21.53"
-export APP_CODE_SERVER_PORT="8091"
\ No newline at end of file
diff --git a/core-lightning-rtl/docker-compose.yml b/core-lightning-rtl/docker-compose.yml
index 89ad9af..7702eea 100644
--- a/core-lightning-rtl/docker-compose.yml
+++ b/core-lightning-rtl/docker-compose.yml
@@ -3,10 +3,10 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_CORE_LIGHTNING_RTL_IP
+      APP_HOST: core-lightning-rtl_web_1
       APP_PORT: 3000
 
-  rtl:
+  web:
     image: shahanafarooqui/rtl:0.13.2@sha256:07d4c1f263c05c32270dcaab3625fc68ef985efce652e7850fbf57f65d36366f
     restart: on-failure
     environment:
@@ -19,7 +19,4 @@ services:
       RTL_COOKIE_PATH: /data/.cookie
     volumes:
       - "${APP_DATA_DIR}/data/rtl:/data"
-      - "${APP_CORE_LIGHTNING_REST_CERT_DIR}:/c-lightning-rest/certs"
-    networks:
-      default:
-        ipv4_address: ${APP_CORE_LIGHTNING_RTL_IP}
\ No newline at end of file
+      - "${APP_CORE_LIGHTNING_REST_CERT_DIR}:/c-lightning-rest/certs"
\ No newline at end of file
diff --git a/core-lightning-rtl/exports.sh b/core-lightning-rtl/exports.sh
deleted file mode 100644
index cfcaa3f..0000000
--- a/core-lightning-rtl/exports.sh
+++ /dev/null
@@ -1 +0,0 @@
-export APP_CORE_LIGHTNING_RTL_IP="10.21.21.97"
\ No newline at end of file
diff --git a/element/docker-compose.yml b/element/docker-compose.yml
index d7e7940..071baaf 100644
--- a/element/docker-compose.yml
+++ b/element/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_ELEMENT_IP
+      APP_HOST: element_web_1
       APP_PORT: 80
 
   web:
@@ -12,6 +12,3 @@ services:
     # user: "1000:1000"
     restart: on-failure
     stop_grace_period: 1m
-    networks:
-      default:
-        ipv4_address: $APP_ELEMENT_IP
diff --git a/element/exports.sh b/element/exports.sh
deleted file mode 100644
index 1735474..0000000
--- a/element/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_ELEMENT_IP="10.21.21.45"
-export APP_ELEMENT_PORT="8088"
\ No newline at end of file
diff --git a/elements/docker-compose.yml b/elements/docker-compose.yml
index 7327a56..5154d8f 100644
--- a/elements/docker-compose.yml
+++ b/elements/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_ELEMENTS_IP
+      APP_HOST: elements_web_1
       APP_PORT: 8080
 
   node:
@@ -38,9 +38,6 @@ services:
       - -port=$APP_ELEMENTS_NODE_P2P_PORT
       - -blockfilterindex=1
       - -peerblockfilters=1
-    networks:
-      default:
-        ipv4_address: $APP_ELEMENTS_NODE_IP
   
   web: 
     image: ghcr.io/tiero/elements-web:v0.0.3@sha256:b80dc0df2a4693668a97b874aad6d0a8d3239d03f4d05b4342600166934d0b87
@@ -51,14 +48,11 @@ services:
       RPC_USER: elements
       RPC_PASS: $APP_PASSWORD
       RPC_PORT: $APP_ELEMENTS_NODE_RPC_PORT
-      RPC_HOST: $APP_ELEMENTS_NODE_IP
+      RPC_HOST: elements_node_1
       P2P_PORT: $APP_ELEMENTS_NODE_P2P_PORT
       # Remote 
       REMOTE_RPC_HOST: $APP_ELEMENTS_RPC_HIDDEN_SERVICE
       REMOTE_P2P_HOST: $APP_ELEMENTS_P2P_HIDDEN_SERVICE
-    networks:
-      default:
-        ipv4_address: $APP_ELEMENTS_IP
   
   tor:
     image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a
diff --git a/elements/exports.sh b/elements/exports.sh
index 3bc8b58..f7c0eb6 100644
--- a/elements/exports.sh
+++ b/elements/exports.sh
@@ -1,6 +1,3 @@
-export APP_ELEMENTS_PORT="3042"
-export APP_ELEMENTS_IP="10.21.21.91"
-export APP_ELEMENTS_NODE_IP="10.21.21.92"
 export APP_ELEMENTS_NODE_RPC_PORT="7041"
 export APP_ELEMENTS_NODE_P2P_PORT="18332"
 
diff --git a/elements/torrc.template b/elements/torrc.template
index a479358..5a9d34c 100644
--- a/elements/torrc.template
+++ b/elements/torrc.template
@@ -1,7 +1,7 @@
 # elements rpc Hidden Service
 HiddenServiceDir /data/app-$APP_ID-rpc
-HiddenServicePort $APP_ELEMENTS_NODE_RPC_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_RPC_PORT
+HiddenServicePort $APP_ELEMENTS_NODE_RPC_PORT elements_node_1:$APP_ELEMENTS_NODE_RPC_PORT
 
 # elements p2p Hidden Service
 HiddenServiceDir /data/app-$APP_ID-p2p
-HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_P2P_PORT
\ No newline at end of file
+HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT elements_node_1:$APP_ELEMENTS_NODE_P2P_PORT
\ No newline at end of file
diff --git a/esphome/docker-compose.yml b/esphome/docker-compose.yml
index a2309cd..24b65d2 100644
--- a/esphome/docker-compose.yml
+++ b/esphome/docker-compose.yml
@@ -3,14 +3,11 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_ESPHOME_IP
+      APP_HOST: esphome_server_1
       APP_PORT: 6052
 
   server:
     image: esphome/esphome:2022.6.2@sha256:1fac6334b85e76c7fd936036891b7a7ee761ee73fd119662b2cb564c3faf818f
     volumes:
       - ${APP_DATA_DIR}/data:/config
-    networks:
-      default:
-        ipv4_address: $APP_ESPHOME_IP
     restart: on-failure
diff --git a/esphome/exports.sh b/esphome/exports.sh
deleted file mode 100644
index 82d65ef..0000000
--- a/esphome/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_ESPHOME_PORT="6052"
-export APP_ESPHOME_IP="10.21.21.104"
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 3c924d9..813418b 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_GITEA_IP
-      APP_PORT: $APP_GITEA_PORT
+      APP_HOST: gitea_server_1
+      APP_PORT: 8085
       PROXY_AUTH_ADD: "false"
 
   server:
@@ -25,13 +25,10 @@ services:
       GITEA__server__SSH_LISTEN_PORT: "${APP_GITEA_SSH_PORT}"
       GITEA__server__START_SSH_SERVER: "true"
       GITEA__database__DB_TYPE: "mysql"
-      GITEA__database__HOST: "${APP_GITEA_DB_IP}:3306"
+      GITEA__database__HOST: "gitea_db_1:3306"
       GITEA__database__NAME: "gitea"
       GITEA__database__USER: "gitea"
       GITEA__database__PASSWD: "moneyprintergobrrr"
-    networks:
-      default:
-        ipv4_address: $APP_GITEA_IP
 
   db:
     image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
@@ -44,6 +41,3 @@ services:
       MYSQL_USER: "gitea"
       MYSQL_PASSWORD: "moneyprintergobrrr"
       MYSQL_DATABASE: "gitea"
-    networks:
-      default:
-        ipv4_address: $APP_GITEA_DB_IP
diff --git a/gitea/exports.sh b/gitea/exports.sh
index 9203196..ef457c8 100644
--- a/gitea/exports.sh
+++ b/gitea/exports.sh
@@ -3,4 +3,4 @@ export APP_GITEA_SSH_PORT="2222"
 export APP_GITEA_IP="10.21.21.39"
 export APP_GITEA_DB_IP="10.21.21.40"
 export APP_GITEA_DOMAIN="git.heier.io"
-export APP_GITEA_TOR_HS_EXTRA_PORTS="22:${APP_GITEA_IP}:${APP_GITEA_SSH_PORT}"
\ No newline at end of file
+export APP_GITEA_TOR_HS_EXTRA_PORTS="22:${APP_GITEA_IP}:${APP_GITEA_SSH_PORT}:gitea_server_1:${APP_GITEA_SSH_PORT}"
\ No newline at end of file
diff --git a/helipad/docker-compose.yml b/helipad/docker-compose.yml
index d2caabe..5ba11b8 100644
--- a/helipad/docker-compose.yml
+++ b/helipad/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_HELIPAD_IP
+      APP_HOST: helipad_web_1
       APP_PORT: 2112
 
   web:
@@ -17,6 +17,3 @@ services:
       - ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
     environment:
       LND_URL: "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT"
-    networks:
-      default:
-        ipv4_address: $APP_HELIPAD_IP
diff --git a/helipad/exports.sh b/helipad/exports.sh
deleted file mode 100644
index 751edde..0000000
--- a/helipad/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_HELIPAD_PORT="2112"
-export APP_HELIPAD_IP="10.21.21.65"
\ No newline at end of file
diff --git a/home-assistant/docker-compose.yml b/home-assistant/docker-compose.yml
index 6f2303e..a6d624f 100644
--- a/home-assistant/docker-compose.yml
+++ b/home-assistant/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_HOME_ASSISTANT_IP
+      APP_HOST: home-assistant_server_1
       APP_PORT: 8123
       PROXY_AUTH_ADD: "false"
 
@@ -12,6 +12,3 @@ services:
     volumes:
       - ${APP_DATA_DIR}/data:/config
       - ${APP_DATA_DIR}/configuration.yaml:/config/configuration.yaml
-    networks:
-      default:
-        ipv4_address: $APP_HOME_ASSISTANT_IP
diff --git a/home-assistant/exports.sh b/home-assistant/exports.sh
deleted file mode 100644
index 1baf807..0000000
--- a/home-assistant/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_HOME_ASSISTANT_PORT="8083"
-export APP_HOME_ASSISTANT_IP="10.21.21.37"
\ No newline at end of file
diff --git a/ipfs-podcasting/docker-compose.yml b/ipfs-podcasting/docker-compose.yml
index 982e67e..01d437c 100644
--- a/ipfs-podcasting/docker-compose.yml
+++ b/ipfs-podcasting/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_IPFS_PODCASTING_IP
-      APP_PORT: $APP_IPFS_PODCASTING_PORT
+      APP_HOST: ipfs-podcasting_web_1
+      APP_PORT: 8675
 
   web:
     image: ipfspodcasting/podcastnode:v0.6@sha256:773d7c34d452764be973e8bc495990ec47f8042287493997784198c64e924393
@@ -13,10 +13,7 @@ services:
     stop_grace_period: 1m
     user: "1000:1000"
     ports:
-      - ${APP_IPFS_PODCASTING_P2P_PORT}:4001  # IPFS
+      - 4001:4001  # IPFS P2P
     volumes:
       - ${APP_DATA_DIR}/ipfs:/ipfs-podcasting/ipfs
       - ${APP_DATA_DIR}/cfg:/ipfs-podcasting/cfg
-    networks:
-      default:
-        ipv4_address: $APP_IPFS_PODCASTING_IP
diff --git a/ipfs-podcasting/exports.sh b/ipfs-podcasting/exports.sh
deleted file mode 100644
index 637c0cc..0000000
--- a/ipfs-podcasting/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_IPFS_PODCASTING_IP="10.21.21.93"
-export APP_IPFS_PODCASTING_PORT="8675"
-export APP_IPFS_PODCASTING_P2P_PORT="4001"
\ No newline at end of file
diff --git a/itchysats/docker-compose.yml b/itchysats/docker-compose.yml
index 9fec4c5..10e484d 100644
--- a/itchysats/docker-compose.yml
+++ b/itchysats/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_ITCHYSATS_IP
+      APP_HOST: itchysats_web_1
       APP_PORT: 8000
 
   web:
@@ -19,7 +19,3 @@ services:
       - --electrum=tcp://$APP_ELECTRS_NODE_IP:$APP_ELECTRS_NODE_PORT
     environment:
       - ITCHYSATS_ENV=umbrel
-
-    networks:
-      default:
-        ipv4_address: $APP_ITCHYSATS_IP
diff --git a/itchysats/exports.sh b/itchysats/exports.sh
deleted file mode 100644
index f5f08b0..0000000
--- a/itchysats/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_ITCHYSATS_IP="10.21.21.64"
-export APP_ITCHYSATS_PORT="7113"
\ No newline at end of file
diff --git a/jam/docker-compose.yml b/jam/docker-compose.yml
index 0990f41..f6fe5af 100644
--- a/jam/docker-compose.yml
+++ b/jam/docker-compose.yml
@@ -3,10 +3,10 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_JAM_IP
+      APP_HOST: jam_web_1
       APP_PORT: 80
 
-  jam:
+  web:
     image: ghcr.io/joinmarket-webui/jam-standalone:v0.1.3-clientserver-v0.9.8@sha256:5cc26732bb3a868c454be8568cc425065b04b07eda63baad24a4d9c44971bb5c
     restart: on-failure
     stop_grace_period: 1m
@@ -25,6 +25,3 @@ services:
       jm_rpc_user: $APP_BITCOIN_RPC_USER
       jm_rpc_password: "${APP_BITCOIN_RPC_PASS}"
       jm_rpc_wallet_file: jam_default
-    networks:
-      default:
-        ipv4_address: $APP_JAM_IP
\ No newline at end of file
diff --git a/jam/exports.sh b/jam/exports.sh
deleted file mode 100644
index 55892df..0000000
--- a/jam/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_JAM_IP="10.21.21.84"
-export APP_JAM_PORT="5002"
\ No newline at end of file
diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
index ce11be3..9415642 100644
--- a/jellyfin/docker-compose.yml
+++ b/jellyfin/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_JELLYFIN_IP
+      APP_HOST: jellyfin_server_1
       APP_PORT: 8096
       PROXY_AUTH_ADD: "false"
 
@@ -20,6 +20,3 @@ services:
     ports:
       # Service auto-discovery
       - 7359:7359/udp
-    networks:
-      default:
-        ipv4_address: $APP_JELLYFIN_IP
diff --git a/jellyfin/exports.sh b/jellyfin/exports.sh
deleted file mode 100644
index e2be306..0000000
--- a/jellyfin/exports.sh
+++ /dev/null
@@ -1 +0,0 @@
-export APP_JELLYFIN_IP="10.21.25.4"
\ No newline at end of file
diff --git a/kollider/docker-compose.yml b/kollider/docker-compose.yml
index 4d0266e..dd03af0 100644
--- a/kollider/docker-compose.yml
+++ b/kollider/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_KOLLIDER_IP
+      APP_HOST: kollider_web_1
       APP_PORT: 3000
   
   backend:
@@ -17,10 +17,7 @@ services:
       - ${APP_DATA_DIR}/data/logs:/app/logs
     environment:
       LND_IP: $APP_LIGHTNING_NODE_IP
-      LND_ZMQ_SUB_ADDRESS: "tcp://${APP_KOLLIDER_WS_IP}:5556"
-    networks:
-      default:
-        ipv4_address: $APP_KOLLIDER_HH_IP
+      LND_ZMQ_SUB_ADDRESS: "tcp://kollider_ws_1:5556"
   
   ws:
     image: kolliderhq/kollider-ws-client:v1.0.6@sha256:05f3d1ddf9949b377788e442a1050457559291a50510f5d6dfa66a28c283a80a
@@ -29,16 +26,13 @@ services:
     restart: on-failure
     stop_grace_period: 1m
     ports:
-      - "$APP_KOLLIDER_WS_PORT:8080"
+      - "4244:8080"
     environment:
       APP_PASSWORD: $APP_PASSWORD
       KOLLIDER_ZMQ_PUB_ADDRESS: "tcp://*:5556"
-      KOLLIDER_ZMQ_SUB_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5557"
-      KOLLIDER_ZMQ_HEDGER_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5558"
-      KOLLIDER_ZMQ_HEDGER_SUB_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5559"
-    networks:
-      default:
-        ipv4_address: $APP_KOLLIDER_WS_IP
+      KOLLIDER_ZMQ_SUB_ADDRESS: "tcp://kollider_backend_1:5557"
+      KOLLIDER_ZMQ_HEDGER_ADDRESS: "tcp://kollider_backend_1:5558"
+      KOLLIDER_ZMQ_HEDGER_SUB_ADDRESS: "tcp://kollider_backend_1:5559"
   
   web:
     image: kolliderhq/kollider-lite-app:v1.0.6@sha256:f5bbbea86ed4d03c9a7c66527edbcda05228986ba5721e65c08a885edb74151a
@@ -48,6 +42,3 @@ services:
     stop_grace_period: 1m
     volumes:
       - ${APP_DATA_DIR}/data/cache/images:/app/.next/cache/images
-    networks:
-      default:
-        ipv4_address: $APP_KOLLIDER_IP
diff --git a/kollider/exports.sh b/kollider/exports.sh
index 74d35c7..a79d41b 100644
--- a/kollider/exports.sh
+++ b/kollider/exports.sh
@@ -1,6 +1 @@
-export APP_KOLLIDER_IP="10.21.21.70"
-export APP_KOLLIDER_PORT="4243"
-export APP_KOLLIDER_WS_IP="10.21.21.71"
-export APP_KOLLIDER_WS_PORT="4244"
-export APP_KOLLIDER_HH_IP="10.21.21.72"
-export APP_KOLLIDER_TOR_HS_EXTRA_PORTS="4244:${APP_KOLLIDER_WS_IP}:8080"
\ No newline at end of file
+export APP_KOLLIDER_TOR_HS_EXTRA_PORTS="4244:kollider_ws_1:8080"
\ No newline at end of file
diff --git a/krystal-bull/docker-compose.yml b/krystal-bull/docker-compose.yml
index 84ddbd6..b1028d2 100644
--- a/krystal-bull/docker-compose.yml
+++ b/krystal-bull/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_KRYSTAL_BULL_IP
+      APP_HOST: krystal-bull_web_1
       APP_PORT: 3001
   
   web:
@@ -17,13 +17,10 @@ services:
     environment:
       LOG_PATH: "/log/"
       BITCOIN_S_HOME: "/bitcoin-s/"
-      ORACLE_SERVER_API_URL: "http://${APP_KRYSTAL_BULL_SERVER_IP}:9998/"
+      ORACLE_SERVER_API_URL: "http://krystal-bull_oracleserver_1:9998/"
       TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT}
       DEFAULT_UI_PASSWORD: "none"
       BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD
-    networks:
-      default:
-        ipv4_address: $APP_KRYSTAL_BULL_IP
     depends_on: 
       - oracleserver
   
@@ -39,6 +36,3 @@ services:
       BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD
       DISABLE_JLINK: "1"
       JAVA_OPTS: "-Xmx256m"
-    networks:
-      default:
-        ipv4_address: $APP_KRYSTAL_BULL_SERVER_IP
diff --git a/krystal-bull/exports.sh b/krystal-bull/exports.sh
deleted file mode 100644
index f90047d..0000000
--- a/krystal-bull/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_KRYSTAL_BULL_IP="10.21.21.56"
-export APP_KRYSTAL_BULL_PORT="3010"
-export APP_KRYSTAL_BULL_SERVER_IP="10.21.21.57"
\ No newline at end of file
diff --git a/lidarr/docker-compose.yml b/lidarr/docker-compose.yml
index d4ef077..9a09748 100644
--- a/lidarr/docker-compose.yml
+++ b/lidarr/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LIDARR_IP
-      APP_PORT: $APP_LIDARR_PORT
+      APP_HOST: lidarr_server_1
+      APP_PORT: 8686
       PROXY_AUTH_WHITELIST: "/api/*"
 
   server:
@@ -16,9 +16,6 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_LIDARR_IP
 
   mac:
     image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@@ -28,8 +25,8 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     environment:
-      DOWNLOAD_CLIENT_API_URL: "http://${APP_LIDARR_IP}:${APP_LIDARR_PORT}/api/v1/downloadclient"
-      ROOT_FOLDER_API_URL: "http://${APP_LIDARR_IP}:${APP_LIDARR_PORT}/api/v1/rootfolder"
+      DOWNLOAD_CLIENT_API_URL: "http://lidarr_server_1:8686/api/v1/downloadclient"
+      ROOT_FOLDER_API_URL: "http://lidarr_server_1:8686/api/v1/rootfolder"
       TRANSMISSION_HOST: "transmission_server_1"
       TRANSMISSION_PORT: 9091
       ROOT_FOLDER: "/downloads/music"
diff --git a/lidarr/exports.sh b/lidarr/exports.sh
deleted file mode 100644
index 52a0d28..0000000
--- a/lidarr/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LIDARR_IP="10.21.25.7"
-export APP_LIDARR_PORT=8686
\ No newline at end of file
diff --git a/lightning-shell/docker-compose.yml b/lightning-shell/docker-compose.yml
index 941b21a..cf70944 100644
--- a/lightning-shell/docker-compose.yml
+++ b/lightning-shell/docker-compose.yml
@@ -3,8 +3,9 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LIGHTNING_SHELL_IP
+      APP_HOST: lightning-shell_web_1
       APP_PORT: 7681
+  
   web:
     image: ghcr.io/ibz/lightning-shell:v0.1.10-buster-slim@sha256:4ea6aafee8ddd092b27850bccef71458d9e382e63d12b159d075bfde328ebef3
     restart: on-failure
@@ -20,6 +21,3 @@ services:
         BITCOIN_RPC_PASS: "${APP_BITCOIN_RPC_PASS}"
         LND_IP: "${APP_LIGHTNING_NODE_IP}"
         LND_GRPC_PORT: ${APP_LIGHTNING_NODE_GRPC_PORT}
-    networks:
-      default:
-        ipv4_address: $APP_LIGHTNING_SHELL_IP
diff --git a/lightning-shell/exports.sh b/lightning-shell/exports.sh
deleted file mode 100644
index e6e81a1..0000000
--- a/lightning-shell/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LIGHTNING_SHELL_PORT="7681"
-export APP_LIGHTNING_SHELL_IP="10.21.21.66"
\ No newline at end of file
diff --git a/lightning-terminal/docker-compose.yml b/lightning-terminal/docker-compose.yml
index dbd75e4..e7d67e3 100644
--- a/lightning-terminal/docker-compose.yml
+++ b/lightning-terminal/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LIGHTNING_TERMINAL_IP
-      APP_PORT: $APP_LIGHTNING_TERMINAL_PORT
+      APP_HOST: lightning-terminal_web_1
+      APP_PORT: 3004
 
   web:
     image: lightninglabs/lightning-terminal:v0.8.3-alpha@sha256:467a4e73b1bc1dd64e32ee75bea5d2343a5b500efa97d61205da18eeb4768723
@@ -19,12 +19,9 @@ services:
       APP_PASSWORD: "$APP_PASSWORD"
     command:
         - --uipassword_env=APP_PASSWORD
-        - --insecure-httplisten=0.0.0.0:$APP_LIGHTNING_TERMINAL_PORT
+        - --insecure-httplisten=0.0.0.0:3004
         - --network="$APP_BITCOIN_NETWORK"
         - --lnd-mode="remote"
         - --remote.lnd.rpcserver=$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT
         - --remote.lnd.macaroonpath="/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"
         - --remote.lnd.tlscertpath="/lnd/tls.cert"
-    networks:
-      default:
-        ipv4_address: $APP_LIGHTNING_TERMINAL_IP
diff --git a/lightning-terminal/exports.sh b/lightning-terminal/exports.sh
deleted file mode 100644
index 6cd5cd2..0000000
--- a/lightning-terminal/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LIGHTNING_TERMINAL_IP="10.21.21.17"
-export APP_LIGHTNING_TERMINAL_PORT="3004"
\ No newline at end of file
diff --git a/ln-visualizer/docker-compose.yml b/ln-visualizer/docker-compose.yml
index ce2649c..7c88322 100644
--- a/ln-visualizer/docker-compose.yml
+++ b/ln-visualizer/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LN_VISUALIZER_WEB_IP
+      APP_HOST: ln-visualizer_web_1
       APP_PORT: 80
 
   web:
@@ -12,10 +12,7 @@ services:
     restart: on-failure
     stop_grace_period: 1m
     environment:
-      LN_VISUALIZER_API_URL: "http://${APP_LN_VISUALIZER_API_IP}:5647"
-    networks:
-      default:
-        ipv4_address: "${APP_LN_VISUALIZER_WEB_IP}"
+      LN_VISUALIZER_API_URL: "http://ln-visualizer_api_1:5647"
 
   api:
     image: maxkotlan/ln-visualizer-api:v0.0.26@sha256:818357452e3a16682b1abd3bc513b30c313703f6fd6e26d6e0c15267a248138b
@@ -30,7 +27,3 @@ services:
       LND_CERT_FILE: "/lnd/tls.cert"
       LND_MACAROON_FILE: "/lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/readonly.macaroon"
       LND_SOCKET: "${APP_LIGHTNING_NODE_IP}:${APP_LIGHTNING_NODE_GRPC_PORT}"
-
-    networks:
-      default:
-        ipv4_address: "${APP_LN_VISUALIZER_API_IP}"
diff --git a/ln-visualizer/exports.sh b/ln-visualizer/exports.sh
deleted file mode 100644
index 7b2eb1c..0000000
--- a/ln-visualizer/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LN_VISUALIZER_WEB_IP="10.21.21.102"
-export APP_LN_VISUALIZER_API_IP="10.21.21.103"
diff --git a/lnbits/docker-compose.yml b/lnbits/docker-compose.yml
index 450ad4e..e331cb6 100644
--- a/lnbits/docker-compose.yml
+++ b/lnbits/docker-compose.yml
@@ -3,9 +3,10 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LNBITS_IP
-      APP_PORT: $APP_LNBITS_PORT
+      APP_HOST: lnbits_web_1
+      APP_PORT: 3007
       PROXY_AUTH_ADD: "false"
+  
   web:
     image: lnbitsdocker/lnbits-legend:0.9.4@sha256:0dbcc5ad5c5d4439c4ee5148206ecd3fbc28422aec2847a3f17e968205dab68b
     init: true
@@ -17,7 +18,7 @@ services:
     environment:
       # Global
       LNBITS_HOST: "0.0.0.0"
-      LNBITS_PORT: "$APP_LNBITS_PORT"
+      LNBITS_PORT: 3007
       LNBITS_DATA_FOLDER: "/data"
 
       # LND
@@ -31,6 +32,3 @@ services:
       LNBITS_DEFAULT_WALLET_NAME: "LNbits wallet"
       LNBITS_DISABLED_EXTENSIONS: "amilk"
       LNBITS_ADMIN_EXTENSIONS: "ngrok"
-    networks:
-        default:
-          ipv4_address: $APP_LNBITS_IP
diff --git a/lnbits/exports.sh b/lnbits/exports.sh
deleted file mode 100644
index a4cb959..0000000
--- a/lnbits/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LNBITS_IP="10.21.21.29"
-export APP_LNBITS_PORT="3007"
\ No newline at end of file
diff --git a/lndboss/docker-compose.yml b/lndboss/docker-compose.yml
index e5445bf..9c13c76 100644
--- a/lndboss/docker-compose.yml
+++ b/lndboss/docker-compose.yml
@@ -3,8 +3,9 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_LNDBOSS_IP
-      APP_PORT: $APP_LNDBOSS_PORT
+      APP_HOST: lndboss_web_1
+      APP_PORT: 8055
+  
   web:
     image: niteshbalusu/lndboss:v2.12.0@sha256:d1a0454d22123dd95c0b8887d9c557937ac006d77d87a0391a9b4dc27e93b0c9
     restart: on-failure
@@ -15,8 +16,5 @@ services:
     environment:
       BOS_DATA_PATH: "/home/node/.bosgui"
       NODE_ENV: "production"
-      PORT: $APP_LNDBOSS_PORT
+      PORT: 8055
       BOS_DEFAULT_LND_SOCKET: $APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT
-    networks:
-      default:
-        ipv4_address: $APP_LNDBOSS_IP
diff --git a/lndboss/exports.sh b/lndboss/exports.sh
deleted file mode 100644
index d98de41..0000000
--- a/lndboss/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_LNDBOSS_IP="10.21.21.47"
-export APP_LNDBOSS_PORT="8055"
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index a3dbc0c..d8b72c9 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_NEXTCLOUD_IP
+      APP_HOST: nextcloud_web_1
       APP_PORT: 80
       PROXY_AUTH_ADD: "false"
   
@@ -20,9 +20,6 @@ services:
       - MYSQL_PASSWORD=moneyprintergobrrr
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
-    networks:
-      default:
-        ipv4_address: $APP_NEXTCLOUD_DB_IP
 
   redis:
     # image: redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396
@@ -31,9 +28,6 @@ services:
     restart: on-failure
     volumes:
       - "${APP_DATA_DIR}/data/redis:/data"
-    networks:
-      default:
-        ipv4_address: $APP_NEXTCLOUD_REDIS_IP
 
   web:
     image: nextcloud:25.0.1-apache@sha256:a200319b132c01ec3486e0dcaf052092b560ec30ac9b78115607696dd201f704
@@ -44,8 +38,8 @@ services:
     volumes:
       - ${APP_DATA_DIR}/data/nextcloud:/var/www/html
     environment:
-      - MYSQL_HOST=${APP_NEXTCLOUD_DB_IP}
-      - REDIS_HOST=${APP_NEXTCLOUD_REDIS_IP}
+      - MYSQL_HOST=nextcloud_db_1
+      - REDIS_HOST=nextcloud_redis_1
       - MYSQL_PASSWORD=moneyprintergobrrr
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
@@ -57,9 +51,6 @@ services:
     depends_on:
       - db
       - redis
-    networks:
-      default:
-        ipv4_address: $APP_NEXTCLOUD_IP
 
   cron:
     image: nextcloud:25.0.1-apache@sha256:a200319b132c01ec3486e0dcaf052092b560ec30ac9b78115607696dd201f704
@@ -73,6 +64,3 @@ services:
     depends_on:
       - db
       - redis
-    networks:
-      default:
-        ipv4_address: $APP_NEXTCLOUD_CRON_IP
diff --git a/nextcloud/exports.sh b/nextcloud/exports.sh
index 797828a..2e4fec1 100644
--- a/nextcloud/exports.sh
+++ b/nextcloud/exports.sh
@@ -1,8 +1,4 @@
 export APP_NEXTCLOUD_PORT="8081"
-export APP_NEXTCLOUD_IP="10.21.21.32"
-export APP_NEXTCLOUD_DB_IP="10.21.21.33"
-export APP_NEXTCLOUD_REDIS_IP="10.21.21.34"
-export APP_NEXTCLOUD_CRON_IP="10.21.21.35"
 
 local_ips=$(hostname --all-ip-addresses 2> /dev/null) || local_ips=""
 export APP_NEXTCLOUD_LOCAL_IPS="${local_ips}"
\ No newline at end of file
diff --git a/node-red-standalone/docker-compose.yml b/node-red-standalone/docker-compose.yml
index 9a847fd..9d5a587 100644
--- a/node-red-standalone/docker-compose.yml
+++ b/node-red-standalone/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_NODE_RED_STANDALONE_IP
-      APP_PORT: $APP_NODE_RED_STANDALONE_PORT
+      APP_HOST: node-red-standalone_web_1
+      APP_PORT: 1881
       # Used to allow (HTTP In) flows to be publicly exposed
       PROXY_AUTH_WHITELIST: "/public/*"
   
@@ -15,7 +15,4 @@ services:
     volumes:
       - ${APP_DATA_DIR}/data:/data
     environment:
-      PORT: $APP_NODE_RED_STANDALONE_PORT
-    networks:
-      default:
-          ipv4_address: $APP_NODE_RED_STANDALONE_IP
+      PORT: 1881
diff --git a/node-red-standalone/exports.sh b/node-red-standalone/exports.sh
deleted file mode 100644
index f9e0c97..0000000
--- a/node-red-standalone/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_NODE_RED_STANDALONE_IP="10.21.21.98"
-export APP_NODE_RED_STANDALONE_PORT="1881"
\ No newline at end of file
diff --git a/node-red/docker-compose.yml b/node-red/docker-compose.yml
index dd2cd85..94f7521 100644
--- a/node-red/docker-compose.yml
+++ b/node-red/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_NODE_RED_IP
-      APP_PORT: $APP_NODE_RED_PORT
+      APP_HOST: node-red_web_1
+      APP_PORT: 1880
       # Used to allow (HTTP In) flows to be publicly exposed
       PROXY_AUTH_WHITELIST: "/public/*"
   
@@ -16,7 +16,7 @@ services:
       - ${APP_DATA_DIR}/data:/data
       - ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
     environment:
-      PORT: $APP_NODE_RED_PORT
+      PORT: 1880
       BITCOIN_NETWORK: $APP_BITCOIN_NETWORK
       BITCOIN_IP: $APP_BITCOIN_NODE_IP
       BITCOIN_RPC_PORT: $APP_BITCOIN_RPC_PORT
@@ -26,6 +26,3 @@ services:
       LND_GRPC_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
       ELECTRUM_IP: $APP_ELECTRS_NODE_IP
       ELECTRUM_PORT: $APP_ELECTRS_NODE_PORT
-    networks:
-      default:
-          ipv4_address: $APP_NODE_RED_IP
diff --git a/node-red/exports.sh b/node-red/exports.sh
deleted file mode 100644
index a1dd679..0000000
--- a/node-red/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_NODE_RED_IP="10.21.21.55"
-export APP_NODE_RED_PORT="1880"
\ No newline at end of file
diff --git a/oak-node/docker-compose.yml b/oak-node/docker-compose.yml
index 82fddfa..eca8396 100644
--- a/oak-node/docker-compose.yml
+++ b/oak-node/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_OAK_NODE_IP
-      APP_PORT: $APP_OAK_NODE_PORT
+      APP_HOST: oak-node_web_1
+      APP_PORT: 8100
 
   web:
     image: oak-node.net/oak:v0.3.4@sha256:b4f218a453a10174492a1b03c66329dff89bdece26c0b024e1bffe9340141048
@@ -16,7 +16,7 @@ services:
       - ${APP_DATA_DIR}/data:/data
       - ${APP_DATA_DIR}/log:/oak/log
     environment:
-      ROCKET_PORT: $APP_OAK_NODE_PORT
+      ROCKET_PORT: 8100
       ROCKET_ADDRESS: 0.0.0.0
       OAK_DATA_DIR: /data
       OAK_LND_REST_API_URL: https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT
@@ -24,6 +24,3 @@ services:
       OAK_LND_CERT_PATH: /lnd-dir/tls.cert
       OAK_ONION_SOCKS5_HOST: $TOR_PROXY_IP
       OAK_ONION_SOCKS5_PORT: $TOR_PROXY_PORT
-    networks:
-      default:
-        ipv4_address: $APP_OAK_NODE_IP
diff --git a/oak-node/exports.sh b/oak-node/exports.sh
deleted file mode 100644
index 52c1368..0000000
--- a/oak-node/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_OAK_NODE_IP="10.21.21.105"
-export APP_OAK_NODE_PORT="8100"
\ No newline at end of file
diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml
index 4bf2113..d8dba90 100644
--- a/photoprism/docker-compose.yml
+++ b/photoprism/docker-compose.yml
@@ -3,11 +3,12 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_PHOTOPRISM_IP
-      APP_PORT: $APP_PHOTOPRISM_PORT
+      APP_HOST: photoprism_web_1
+      APP_PORT: 8087
       # These endpoints are protected by HTTP Basic Auth by Photoprism.
       # More details here: https://docs.photoprism.app/user-guide/sync/webdav/#server-url
       PROXY_AUTH_WHITELIST: "/originals/*,/import/*"
+  
   web:
     image: photoprism/photoprism:221105-bullseye@sha256:52f2cfb9f46aec44dd2dec87c78ca121cc6fd174510db1ac371072c527f86558
     user: "1000:1000"
@@ -20,20 +21,17 @@ services:
       PHOTOPRISM_ADMIN_PASSWORD: "${APP_PASSWORD}"
       PHOTOPRISM_ORIGINALS_LIMIT: 10000
       PHOTOPRISM_HTTP_COMPRESSION: "gzip"
-      PHOTOPRISM_HTTP_PORT: "${APP_PHOTOPRISM_PORT}"
+      PHOTOPRISM_HTTP_PORT: 8087
       PHOTOPRISM_DATABASE_DRIVER: "mysql"
-      PHOTOPRISM_DATABASE_SERVER: "${APP_PHOTOPRISM_DB_IP}:3306"
+      PHOTOPRISM_DATABASE_SERVER: "photoprism_db_1:3306"
       PHOTOPRISM_DATABASE_NAME: "photoprism"
       PHOTOPRISM_DATABASE_USER: "photoprism"
       PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
-      PHOTOPRISM_SITE_URL: "http://${APP_DOMAIN}:${APP_PHOTOPRISM_PORT}/"
+      PHOTOPRISM_SITE_URL: "http://${APP_DOMAIN}:8087/"
       PHOTOPRISM_SITE_TITLE: "PhotoPrism"
       PHOTOPRISM_SITE_CAPTION: "Digital Asset Management"
       PHOTOPRISM_SITE_DESCRIPTION: ""
       PHOTOPRISM_SITE_AUTHOR: ""
-    networks:
-      default:
-        ipv4_address: ${APP_PHOTOPRISM_IP}
 
   db:
     image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
@@ -48,6 +46,3 @@ services:
       MYSQL_DATABASE: "photoprism"
       MYSQL_USER: "photoprism"
       MYSQL_PASSWORD: "photoprism"
-    networks:
-      default:
-        ipv4_address: ${APP_PHOTOPRISM_DB_IP}
diff --git a/photoprism/exports.sh b/photoprism/exports.sh
deleted file mode 100644
index 91b5def..0000000
--- a/photoprism/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_PHOTOPRISM_IP="10.21.21.42"
-export APP_PHOTOPRISM_PORT="8087"
-export APP_PHOTOPRISM_DB_IP="10.21.21.43"
\ No newline at end of file
diff --git a/pi-hole/docker-compose.yml b/pi-hole/docker-compose.yml
index cfc48bb..ea7b22c 100644
--- a/pi-hole/docker-compose.yml
+++ b/pi-hole/docker-compose.yml
@@ -3,9 +3,10 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_PI_HOLE_IP
+      APP_HOST: pi-hole_server_1
       APP_PORT: 80
       PROXY_AUTH_ADD: "false"
+  
   server:
     image: pihole/pihole:2022.11.1@sha256:7ea4b00fcb3e4942b88015ddbb1fe9bbda95b692d8e56f1a13481356a1eb2707
     # Pi-hole doesn't currently support running as non-root
@@ -21,6 +22,3 @@ services:
     environment:
       - VIRTUAL_HOST=${APP_DOMAIN}
       - WEBPASSWORD=${APP_PASSWORD}
-    networks:
-      default:
-        ipv4_address: $APP_PI_HOLE_IP
diff --git a/pi-hole/exports.sh b/pi-hole/exports.sh
deleted file mode 100644
index 82a17e9..0000000
--- a/pi-hole/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_PI_HOLE_PORT="8082"
-export APP_PI_HOLE_IP="10.21.21.36"
\ No newline at end of file
diff --git a/plex/docker-compose.yml b/plex/docker-compose.yml
index 924f833..46b6af1 100644
--- a/plex/docker-compose.yml
+++ b/plex/docker-compose.yml
@@ -27,6 +27,3 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${APP_DATA_DIR}/data/transcode:/transcode
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
-    networks:
-      default:
-        ipv4_address: $APP_PLEX_IP
diff --git a/plex/exports.sh b/plex/exports.sh
index c79869e..de03b62 100644
--- a/plex/exports.sh
+++ b/plex/exports.sh
@@ -1,5 +1,3 @@
-export APP_PLEX_IP="10.21.25.2"
-
 # As Plex does not use the app proxy
 # There is a bug when generating the Tor HS
 # This 'fix' will create a fake HS hostname
diff --git a/prowlarr/docker-compose.yml b/prowlarr/docker-compose.yml
index 0959f35..7bd7a39 100644
--- a/prowlarr/docker-compose.yml
+++ b/prowlarr/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_PROWLARR_IP
-      APP_PORT: $APP_PROWLARR_PORT
+      APP_HOST: prowlarr_server_1
+      APP_PORT: 9696
       PROXY_AUTH_WHITELIST: "/api/*"
 
   server:
@@ -16,9 +16,6 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_PROWLARR_IP
 
   mac:
     image: getumbrel/media-app-configurator:v1.1.0@sha256:987f6a02367adf86ab1cff38e1e2d43d85e17a6fc130aae4af196fb571dff06a
diff --git a/prowlarr/exports.sh b/prowlarr/exports.sh
index e2c9d58..a79b6da 100644
--- a/prowlarr/exports.sh
+++ b/prowlarr/exports.sh
@@ -1,6 +1,3 @@
-export APP_PROWLARR_IP="10.21.25.8"
-export APP_PROWLARR_PORT=9696
-
 export APP_PROWLARR_RADARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/radarr/data/config/config.xml" 2>/dev/null || echo "")
 export APP_PROWLARR_LIDARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/lidarr/data/config/config.xml" 2>/dev/null || echo "")
 export APP_PROWLARR_SONARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/sonarr/data/config/config.xml" 2>/dev/null || echo "")
\ No newline at end of file
diff --git a/radarr/docker-compose.yml b/radarr/docker-compose.yml
index 8a00cf7..1c4bd03 100644
--- a/radarr/docker-compose.yml
+++ b/radarr/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_RADARR_IP
-      APP_PORT: $APP_RADARR_PORT
+      APP_HOST: radarr_server_1
+      APP_PORT: 7878
       PROXY_AUTH_WHITELIST: "/api/*"
 
   server:
@@ -16,9 +16,6 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_RADARR_IP
 
   mac:
     image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@@ -28,8 +25,8 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     environment:
-      DOWNLOAD_CLIENT_API_URL: "http://${APP_RADARR_IP}:${APP_RADARR_PORT}/api/v3/downloadclient"
-      ROOT_FOLDER_API_URL: "http://${APP_RADARR_IP}:${APP_RADARR_PORT}/api/v3/rootfolder"
+      DOWNLOAD_CLIENT_API_URL: "http://radarr_server_1:7878/api/v3/downloadclient"
+      ROOT_FOLDER_API_URL: "http://radarr_server_1:7878/api/v3/rootfolder"
       TRANSMISSION_HOST: "transmission_server_1"
       TRANSMISSION_PORT: 9091
       ROOT_FOLDER: "/downloads/movies"
diff --git a/radarr/exports.sh b/radarr/exports.sh
deleted file mode 100644
index c54ecdd..0000000
--- a/radarr/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_RADARR_IP="10.21.25.5"
-export APP_RADARR_PORT=7878
\ No newline at end of file
diff --git a/ride-the-lightning/docker-compose.yml b/ride-the-lightning/docker-compose.yml
index 5d89ad6..8151d7f 100644
--- a/ride-the-lightning/docker-compose.yml
+++ b/ride-the-lightning/docker-compose.yml
@@ -3,8 +3,9 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_RIDE_THE_LIGHTNING_IP
-      APP_PORT: $APP_RIDE_THE_LIGHTNING_PORT
+      APP_HOST: ride-the-lightning_web_1
+      APP_PORT: 3001
+  
   web:
     image: shahanafarooqui/rtl:0.13.2@sha256:07d4c1f263c05c32270dcaab3625fc68ef985efce652e7850fbf57f65d36366f
     user: "1000:1000"
@@ -19,7 +20,7 @@ services:
     environment:
         # App config
         APP_PASSWORD: $APP_PASSWORD
-        PORT: $APP_RIDE_THE_LIGHTNING_PORT
+        PORT: 3001
         RTL_CONFIG_PATH: "/data"
         CHANNEL_BACKUP_PATH: "/data/backup"
         LN_IMPLEMENTATION: "LND"
@@ -30,11 +31,8 @@ services:
         CONFIG_PATH: "/lnd/lnd.conf"
 
         # Boltz
-        BOLTZ_SERVER_URL: "https://$APP_RIDE_THE_LIGHTNING_BOLTZ_IP:9003"
+        BOLTZ_SERVER_URL: "https://ride-the-lightning_boltz_1:9003"
         BOLTZ_MACAROON_PATH: "/boltz/.boltz-lnd/macaroons"
-    networks:
-      default:
-        ipv4_address: $APP_RIDE_THE_LIGHTNING_IP
 
   boltz:
     image: boltz/boltz-lnd:1.2.6@sha256:01a56dd357a2460bfd0ecdd726d6db3ab59d78ee691250831d09ba5de3fec7ce
@@ -50,8 +48,5 @@ services:
       - --lnd.host="$APP_LIGHTNING_NODE_IP"
       - --lnd.macaroon="/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"
       - --lnd.certificate="/lnd/tls.cert"
-      - --rpc.rest.host="$APP_RIDE_THE_LIGHTNING_BOLTZ_IP"
+      - --rpc.rest.host="0.0.0.0"
       - --rpc.rest.port="9003"
-    networks:
-      default:
-        ipv4_address: $APP_RIDE_THE_LIGHTNING_BOLTZ_IP
diff --git a/ride-the-lightning/exports.sh b/ride-the-lightning/exports.sh
deleted file mode 100644
index 57aaad9..0000000
--- a/ride-the-lightning/exports.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export APP_RIDE_THE_LIGHTNING_IP="10.21.21.15"
-export APP_RIDE_THE_LIGHTNING_PORT="3001"
-export APP_RIDE_THE_LIGHTNING_LOOP_IP="10.21.21.16" # Legacy
-export APP_RIDE_THE_LIGHTNING_BOLTZ_IP="10.21.21.63"
\ No newline at end of file
diff --git a/robosats/docker-compose.yml b/robosats/docker-compose.yml
index c453269..45869a8 100644
--- a/robosats/docker-compose.yml
+++ b/robosats/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: ${APP_ROBOSATS_IP}
-      APP_PORT: ${APP_ROBOSATS_PORT}
+      APP_HOST: robosats_web_1
+      APP_PORT: 12596
 
   web:
     image: recksato/robosats-client:v0.3.1-alpha@sha256:5056f6905a4f93c319def72a89bf05f33443f4c4b5f4dcd1232331996335cf9e
@@ -15,6 +15,3 @@ services:
       TOR_PROXY_IP: ${TOR_PROXY_IP}
       TOR_PROXY_PORT: ${TOR_PROXY_PORT}
       ROBOSATS_ONION: robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion
-    networks:
-      default:
-        ipv4_address: ${APP_ROBOSATS_IP}
diff --git a/robosats/exports.sh b/robosats/exports.sh
deleted file mode 100644
index 73d7b5a..0000000
--- a/robosats/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_ROBOSATS_IP="10.21.21.108"
-export APP_ROBOSATS_PORT="12596"
\ No newline at end of file
diff --git a/samourai-server/docker-compose.yml b/samourai-server/docker-compose.yml
index 42dc96e..f221305 100644
--- a/samourai-server/docker-compose.yml
+++ b/samourai-server/docker-compose.yml
@@ -3,9 +3,10 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SAMOURAI_SERVER_IP
+      APP_HOST: samourai-server_nginx_1
       APP_PORT: 8081
       PROXY_AUTH_ADD: "false"
+  
   db:
     image: louneskmt/dojo-db:1.5.0-low-mem@sha256:5af4f90818d55360e572033fcc493cd945143e7a3aaef91fa7e102f3c66c7a5b
     init: true
@@ -19,15 +20,12 @@ services:
       MYSQL_PASSWORD: password
     volumes:
       - ${APP_DATA_DIR}/mysql/data:/var/lib/mysql
-    networks:
-      default:
-        ipv4_address: $APP_SAMOURAI_SERVER_DB_IP
 
   node:
     image: louneskmt/dojo-nodejs:1.16.1@sha256:49de92774ecfcb88af1dc67f8d498641d750c4ec9acaab3c448d70c4f2d4bfe7
     init: true
     restart: on-failure
-    command: "/home/node/app/wait-for-it.sh ${APP_SAMOURAI_SERVER_DB_IP}:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
+    command: "/home/node/app/wait-for-it.sh samourai-server_db_1:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
     user: "1000:1000"
     environment:
       # GLOBAL
@@ -35,7 +33,7 @@ services:
       DOJO_VERSION_TAG: 1.16.1
       NET_DOJO_TOR_IPV4: $TOR_PROXY_IP
       TOR_SOCKS_PORT: $TOR_PROXY_PORT
-      NET_DOJO_MYSQL_IPV4: $APP_SAMOURAI_SERVER_DB_IP
+      NET_DOJO_MYSQL_IPV4: samourai-server_db_1
 
       # MYSQL
       MYSQL_DATABASE: samourai-main
@@ -84,9 +82,6 @@ services:
       INDEXER_BATCH_SUPPORT: inactive # 'active' for ElectrumX, 'inactive' otherwise
     depends_on:
       - db
-    networks:
-      default:
-        ipv4_address: $APP_SAMOURAI_SERVER_NODE_IP
 
   whirlpool:
     image: louneskmt/whirlpool:0.10.15@sha256:3b766327dfa4c2ae40f190c18afa1f3c9cb9101d7964049dc79bdcb89fd21a90
@@ -97,7 +92,7 @@ services:
       - "--listen"
       - "--cli.apiKey=$APP_SAMOURAI_SERVER_WHIRLPOOL_API_KEY"
       - "--cli.api.http-enable=true"
-      - "--cli.api.http-port=$APP_SAMOURAI_SERVER_WHIRLPOOL_PORT"
+      - "--cli.api.http-port=8898"
       - "--cli.tor=true"
       - "--cli.torConfig.coordinator.enabled=true"
       - "--cli.torConfig.coordinator.onion=true"
@@ -109,14 +104,11 @@ services:
     environment:
       WHIRLPOOL_BITCOIN_NETWORK: $APP_BITCOIN_NETWORK
       WHIRLPOOL_DOJO: "on"
-      WHIRLPOOL_DOJO_IP: $APP_SAMOURAI_SERVER_IP
+      WHIRLPOOL_DOJO_IP: "samourai-server_nginx_1"
     depends_on:
       - node
     volumes:
       - ${APP_DATA_DIR}/whirlpool:/home/whirlpool/.whirlpool-cli
-    networks:
-      default:
-        ipv4_address: $APP_SAMOURAI_SERVER_WHIRLPOOL_IP
 
   nginx:
     image: nginx:1.21-alpine@sha256:686aac2769fd6e7bab67663fd38750c135b72d993d0bb0a942ab02ef647fc9c3
@@ -131,19 +123,16 @@ services:
       - ${APP_DATA_DIR}/nginx/connect:/var/www/connect
     environment:
       COMMON_BTC_NETWORK: $APP_BITCOIN_NETWORK
-      DOJO_LOCAL_PORT: $APP_SAMOURAI_SERVER_DOJO_PORT
+      DOJO_LOCAL_PORT: 3009
       DOJO_HIDDEN_SERVICE: $APP_SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE
       WHIRLPOOL_HIDDEN_SERVICE: $APP_SAMOURAI_SERVER_WHIRLPOOL_HIDDEN_SERVICE
       NODE_PREFIX_SUPPORT: support
       NODE_ADMIN_KEY: $APP_SAMOURAI_SERVER_NODE_ADMIN_KEY
       WHIRLPOOL_API_KEY: $APP_SAMOURAI_SERVER_WHIRLPOOL_API_KEY
     ports:
-      - "$APP_SAMOURAI_SERVER_DOJO_PORT:80"
+      - "3009:80"
     depends_on:
       - node
-    networks:
-      default:
-        ipv4_address: $APP_SAMOURAI_SERVER_IP
 
   tor:
     image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a
diff --git a/samourai-server/exports.sh b/samourai-server/exports.sh
index e82785e..f81b902 100644
--- a/samourai-server/exports.sh
+++ b/samourai-server/exports.sh
@@ -1,11 +1,3 @@
-export APP_SAMOURAI_SERVER_IP="10.21.21.22"
-export APP_SAMOURAI_SERVER_DOJO_PORT="3009"
-export APP_SAMOURAI_SERVER_CONNECT_PORT="3005"
-export APP_SAMOURAI_SERVER_WHIRLPOOL_IP="10.21.21.23"
-export APP_SAMOURAI_SERVER_WHIRLPOOL_PORT="8898"
-export APP_SAMOURAI_SERVER_DB_IP="10.21.21.24"
-export APP_SAMOURAI_SERVER_NODE_IP="10.21.21.25"
-
 dojo_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-dojo/hostname"
 whirlpool_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-whirlpool/hostname"
 export APP_SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE="$(cat "${dojo_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
diff --git a/samourai-server/torrc.template b/samourai-server/torrc.template
index ec10bff..df93880 100644
--- a/samourai-server/torrc.template
+++ b/samourai-server/torrc.template
@@ -1,7 +1,3 @@
-# samourai-server dojo Hidden Service
-HiddenServiceDir /data/app-$APP_ID-dojo
-HiddenServicePort 80 $APP_SAMOURAI_SERVER_IP:80
-
 # samourai-server whirlpool Hidden Service
 HiddenServiceDir /data/app-$APP_ID-whirlpool
-HiddenServicePort 80 $APP_SAMOURAI_SERVER_WHIRLPOOL_IP:$APP_SAMOURAI_SERVER_WHIRLPOOL_PORT
\ No newline at end of file
+HiddenServicePort 80 samourai-server_whirlpool_1:8898
\ No newline at end of file
diff --git a/satsale/docker-compose.yml b/satsale/docker-compose.yml
index cee8c55..3d442cd 100644
--- a/satsale/docker-compose.yml
+++ b/satsale/docker-compose.yml
@@ -3,10 +3,11 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SATSALE_IP
+      APP_HOST: satsale_web_1
       APP_PORT: 5000
       PROXY_AUTH_ADD: "false"
-  satsale:
+  
+  web:
     image: satsale/satsale:0.1.13@sha256:98380ad6c5166d83e627c4d1f4efdbcfd5b9217096f7fb26b287fda89eebccbb
     restart: on-failure
     stop_grace_period: 1m
@@ -22,6 +23,3 @@ services:
       MACAROON_FILE: /lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/invoice.macaroon
       TLS_FILE: /lnd/tls.cert
       APP_PASSWORD: $APP_PASSWORD
-    networks:
-        default:
-          ipv4_address: $APP_SATSALE_IP
diff --git a/satsale/exports.sh b/satsale/exports.sh
deleted file mode 100644
index 09740c6..0000000
--- a/satsale/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SATSALE_PORT="5000"
-export APP_SATSALE_IP="10.21.21.67"
\ No newline at end of file
diff --git a/simple-torrent/docker-compose.yml b/simple-torrent/docker-compose.yml
index dd5ca57..2cf4ab2 100644
--- a/simple-torrent/docker-compose.yml
+++ b/simple-torrent/docker-compose.yml
@@ -3,20 +3,17 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SIMPLE_TORRENT_IP
-      APP_PORT: $APP_SIMPLE_TORRENT_PORT
+      APP_HOST: simple-torrent_server_1
+      APP_PORT: 8086
 
   server:
     image: boypt/cloud-torrent:1.3.9@sha256:90cc62869ebaabbdba31535cdff4c66ede98b341956d2ebcd6650610a37e9819
     user: "1000:1000"
     restart: on-failure
     command: >
-      --port=${APP_SIMPLE_TORRENT_PORT}
+      --port=8086
       --config-path /config/simple-torrent.json
     volumes:
       - ${APP_DATA_DIR}/data/torrents:/torrents
       - ${APP_DATA_DIR}/data/downloads:/downloads
       - ${APP_DATA_DIR}/data/config:/config
-    networks:
-      default:
-        ipv4_address: $APP_SIMPLE_TORRENT_IP
diff --git a/simple-torrent/exports.sh b/simple-torrent/exports.sh
deleted file mode 100644
index e107ee6..0000000
--- a/simple-torrent/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SIMPLE_TORRENT_IP="10.21.21.41"
-export APP_SIMPLE_TORRENT_PORT="8086"
\ No newline at end of file
diff --git a/snowflake/docker-compose.yml b/snowflake/docker-compose.yml
index 1c7c7e6..30216d5 100644
--- a/snowflake/docker-compose.yml
+++ b/snowflake/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SNOWFLAKE_IP
-      APP_PORT: $APP_SNOWFLAKE_PORT
+      APP_HOST: snowflake_web_1
+      APP_PORT: 3800
 
   proxy:
     image: getumbrel/snowflake:v2.1.0@sha256:875a513540a132752a4b09f5d6de4ed41399c5331265d6576dcfb5952bb22053
@@ -13,17 +13,11 @@ services:
     command: "-log /data/snowflake.log -verbose"
     volumes:
       - ${APP_DATA_DIR}/data:/data
-    networks:
-      default:
-        ipv4_address: $APP_SNOWFLAKE_PROXY_IP
 
   web:
     image: getumbrel/gotty:v1.0.1@sha256:100571d271cfbae25603acac216afce511eece9961218c6db427e0fa4a58716a
     restart: on-failure
     stop_grace_period: 1m
-    command: --port $APP_SNOWFLAKE_PORT --index "/snowflake/index.html" --title-format "Tor Snowflake Proxy" bash -c 'tail -n 10000 -f /snowflake/snowflake.log | grep "Traffic Relayed"'
+    command: --port 3800 --index "/snowflake/index.html" --title-format "Tor Snowflake Proxy" bash -c 'tail -n 10000 -f /snowflake/snowflake.log | grep "Traffic Relayed"'
     volumes:
       - ${APP_DATA_DIR}/data:/snowflake
-    networks:
-      default:
-        ipv4_address: $APP_SNOWFLAKE_IP
diff --git a/snowflake/exports.sh b/snowflake/exports.sh
deleted file mode 100644
index ac2a698..0000000
--- a/snowflake/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_SNOWFLAKE_IP="10.21.21.82"
-export APP_SNOWFLAKE_PORT="3800"
-export APP_SNOWFLAKE_PROXY_IP="10.21.21.83"
\ No newline at end of file
diff --git a/sonarr/docker-compose.yml b/sonarr/docker-compose.yml
index 17db647..2a9b07a 100644
--- a/sonarr/docker-compose.yml
+++ b/sonarr/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SONARR_IP
-      APP_PORT: $APP_SONARR_PORT
+      APP_HOST: sonarr_server_1
+      APP_PORT: 8989
       PROXY_AUTH_WHITELIST: "/api/*"
 
   server:
@@ -16,9 +16,6 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_SONARR_IP
 
   mac:
     image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@@ -28,8 +25,8 @@ services:
       - ${APP_DATA_DIR}/data/config:/config
       - ${UMBREL_ROOT}/data/storage/downloads:/downloads
     environment:
-      DOWNLOAD_CLIENT_API_URL: "http://${APP_SONARR_IP}:${APP_SONARR_PORT}/api/v3/downloadclient"
-      ROOT_FOLDER_API_URL: "http://${APP_SONARR_IP}:${APP_SONARR_PORT}/api/v3/rootfolder"
+      DOWNLOAD_CLIENT_API_URL: "http://sonarr_server_1:8989/api/v3/downloadclient"
+      ROOT_FOLDER_API_URL: "http://sonarr_server_1:8989/api/v3/rootfolder"
       TRANSMISSION_HOST: "transmission_server_1"
       TRANSMISSION_PORT: 9091
       ROOT_FOLDER: "/downloads/shows"
\ No newline at end of file
diff --git a/sonarr/exports.sh b/sonarr/exports.sh
deleted file mode 100644
index 4f95533..0000000
--- a/sonarr/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SONARR_IP="10.21.25.6"
-export APP_SONARR_PORT=8989
\ No newline at end of file
diff --git a/sparkkiosk/docker-compose.yml b/sparkkiosk/docker-compose.yml
index bab1a6f..5d25c10 100644
--- a/sparkkiosk/docker-compose.yml
+++ b/sparkkiosk/docker-compose.yml
@@ -3,9 +3,9 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      PROXY_AUTH_ADD: "false"
-      APP_HOST: $APP_SPARKKIOSK_IP
+      APP_HOST: sparkkiosk_web_1
       APP_PORT: 21214
+      PROXY_AUTH_ADD: "false"
 
   web:
     image: jensgertsen/sparkkiosk:v1.0.0@sha256:d49500ce9c47d04436e64dae7e336416aa32f83673058154aa8a983e1420008c
@@ -17,9 +17,6 @@ services:
       - ${APP_DATA_DIR}/data:/data
       - ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
     environment:
-      # Global
-   
-
       # LND
       LND_GRPC_ENDPOINT: $APP_LIGHTNING_NODE_IP
       LND_GRPC_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
@@ -30,6 +27,3 @@ services:
       APP_HIDDEN_SERVICE: http://$APP_HIDDEN_SERVICE
       APP_PASSWORD: $APP_PASSWORD
       APP_DOMAIN: $APP_DOMAIN
-    networks:
-      default:
-        ipv4_address: $APP_SPARKKIOSK_IP
diff --git a/sparkkiosk/exports.sh b/sparkkiosk/exports.sh
deleted file mode 100644
index 99434c7..0000000
--- a/sparkkiosk/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SPARKKIOSK_IP="10.21.21.90"
-export APP_SPARKKIOSK_PORT="21214"
\ No newline at end of file
diff --git a/specter-desktop/docker-compose.yml b/specter-desktop/docker-compose.yml
index 3ac6a0f..ea75962 100644
--- a/specter-desktop/docker-compose.yml
+++ b/specter-desktop/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SPECTER_DESKTOP_IP
-      APP_PORT: $APP_SPECTER_DESKTOP_PORT
+      APP_HOST: specter-desktop_web_1
+      APP_PORT: 25441
 
   web:
     image: lncm/specter-desktop:v1.13.1@sha256:d277dec2a54fc77f3ccbc0f082183abce31e655b50f21da8d098f90fb734a15b
@@ -23,6 +23,3 @@ services:
       BTC_RPC_HOST: $APP_BITCOIN_NODE_IP
       BTC_RPC_PORT: $APP_BITCOIN_RPC_PORT
       BTC_RPC_PROTOCOL: http
-    networks:
-      default:
-        ipv4_address: $APP_SPECTER_DESKTOP_IP
diff --git a/specter-desktop/exports.sh b/specter-desktop/exports.sh
deleted file mode 100644
index cb6e455..0000000
--- a/specter-desktop/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SPECTER_DESKTOP_IP="10.21.21.18"
-export APP_SPECTER_DESKTOP_PORT="25441"
\ No newline at end of file
diff --git a/sphinx-relay/docker-compose.yml b/sphinx-relay/docker-compose.yml
index a993613..6572c0e 100644
--- a/sphinx-relay/docker-compose.yml
+++ b/sphinx-relay/docker-compose.yml
@@ -3,12 +3,11 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SPHINX_RELAY_IP
+      APP_HOST: sphinx-relay_server_1
       APP_PORT: $APP_SPHINX_RELAY_PORT
       PROXY_AUTH_ADD: "false"
 
-  sphinx-relay:
-    container_name: sphinx-relay
+  server:
     image: sphinxlightning/sphinx-relay:v2.2.12@sha256:96778f56fc3b2c7703ec6d0d3162a9fe4c82b0d57179819c90efc479cdc1620a
     init: true
     restart: on-failure
@@ -24,6 +23,3 @@ services:
       TLS_LOCATION: /lnd/tls.cert
       MACAROON_LOCATION: /lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/admin.macaroon
       LND_LOG_LOCATION: /lnd/logs/bitcoin/${APP_BITCOIN_NETWORK}/lnd.log
-    networks:
-      default:
-        ipv4_address: $APP_SPHINX_RELAY_IP
diff --git a/sphinx-relay/exports.sh b/sphinx-relay/exports.sh
index 640d6e6..30c1e9c 100644
--- a/sphinx-relay/exports.sh
+++ b/sphinx-relay/exports.sh
@@ -1,3 +1,2 @@
-export APP_SPHINX_RELAY_IP="10.21.21.14"
 export APP_SPHINX_RELAY_PORT="3300"
-export APP_SPHINX_RELAY_TOR_HS_EXTRA_PORTS="${APP_SPHINX_RELAY_PORT}:${APP_SPHINX_RELAY_IP}:${APP_SPHINX_RELAY_PORT}"
\ No newline at end of file
+export APP_SPHINX_RELAY_TOR_HS_EXTRA_PORTS="${APP_SPHINX_RELAY_PORT}:sphinx-relay_server_1:${APP_SPHINX_RELAY_PORT}"
\ No newline at end of file
diff --git a/squeaknode/docker-compose.yml b/squeaknode/docker-compose.yml
index 3a57116..e652051 100644
--- a/squeaknode/docker-compose.yml
+++ b/squeaknode/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SQUEAKNODE_IP
+      APP_HOST: squeaknode_web_1
       APP_PORT: $APP_SQUEAKNODE_PORT
 
   web:
@@ -46,9 +46,6 @@ services:
       SQUEAKNODE_SERVER_EXTERNAL_ADDRESS: $APP_SQUEAKNODE_P2P_HIDDEN_SERVICE
 
       DEBUG: "squeaknode:*"
-    networks:
-      default:
-        ipv4_address: $APP_SQUEAKNODE_IP
 
   tor:
     image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a
diff --git a/squeaknode/exports.sh b/squeaknode/exports.sh
index 7bcd11e..6e0d5bc 100644
--- a/squeaknode/exports.sh
+++ b/squeaknode/exports.sh
@@ -1,4 +1,3 @@
-export APP_SQUEAKNODE_IP="10.21.21.54"
 export APP_SQUEAKNODE_PORT="12994"
 export APP_SQUEAKNODE_GRPC_PORT="8994"
 export APP_SQUEAKNODE_P2P_PORT="8555"
diff --git a/squeaknode/torrc.template b/squeaknode/torrc.template
index 7a8766a..2315433 100644
--- a/squeaknode/torrc.template
+++ b/squeaknode/torrc.template
@@ -1,4 +1,4 @@
 # squeaknode p2p Hidden Service
 HiddenServiceDir /data/app-$APP_ID-p2p
-HiddenServicePort $APP_SQUEAKNODE_P2P_PORT $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_P2P_PORT
-HiddenServicePort $APP_SQUEAKNODE_P2P_TESTNET_PORT $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_P2P_TESTNET_PORT
\ No newline at end of file
+HiddenServicePort $APP_SQUEAKNODE_P2P_PORT squeaknode_web_1:$APP_SQUEAKNODE_P2P_PORT
+HiddenServicePort $APP_SQUEAKNODE_P2P_TESTNET_PORT squeaknode_web_1:$APP_SQUEAKNODE_P2P_TESTNET_PORT
\ No newline at end of file
diff --git a/squeakroad/docker-compose.yml b/squeakroad/docker-compose.yml
index 3ed2c8b..5627c84 100644
--- a/squeakroad/docker-compose.yml
+++ b/squeakroad/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SQUEAKROAD_IP
-      APP_PORT: $APP_SQUEAKROAD_PORT
+      APP_HOST: squeakroad_web_1
+      APP_PORT: 18200
       PROXY_AUTH_ADD: "false"
 
   web:
@@ -16,7 +16,7 @@ services:
       - $APP_LIGHTNING_NODE_DATA_DIR:/lnd-dir:ro
       - ${APP_DATA_DIR}/data:/data
     environment:
-      ROCKET_PORT: $APP_SQUEAKROAD_PORT
+      ROCKET_PORT: 18200
       ROCKET_ADDRESS: 0.0.0.0
       SQUEAKROAD_DB_URL: /data/db.sqlite
       SQUEAKROAD_ADMIN_USERNAME: umbrel
@@ -25,6 +25,3 @@ services:
       SQUEAKROAD_LND_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
       SQUEAKROAD_LND_TLS_CERT_PATH: /lnd-dir/tls.cert
       SQUEAKROAD_LND_MACAROON_PATH: /lnd-dir/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon
-    networks:
-      default:
-        ipv4_address: $APP_SQUEAKROAD_IP
diff --git a/squeakroad/exports.sh b/squeakroad/exports.sh
deleted file mode 100644
index c8008a3..0000000
--- a/squeakroad/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_SQUEAKROAD_IP="10.21.21.99"
-export APP_SQUEAKROAD_PORT="18200"
diff --git a/suredbits-wallet/docker-compose.yml b/suredbits-wallet/docker-compose.yml
index 3220357..bf39059 100644
--- a/suredbits-wallet/docker-compose.yml
+++ b/suredbits-wallet/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SUREDBITS_WALLET_IP
+      APP_HOST: suredbits-wallet_web_1
       APP_PORT: 3002
 
   web:
@@ -17,15 +17,12 @@ services:
     environment:
       LOG_PATH: "/log/"
       BITCOIN_S_HOME: "/bitcoin-s/"
-     #MEMPOOL_API_URL: "http://umbrel.local:${APP_MEMPOOL_PORT}/api"
-      WALLET_SERVER_API_URL: "http://${APP_SUREDBITS_WALLET_SERVER_IP}:9999/"
-      WALLET_SERVER_WS: "ws://${APP_SUREDBITS_WALLET_SERVER_IP}:19999/events"
+      #MEMPOOL_API_URL: "http://umbrel.local:${APP_MEMPOOL_PORT}/api"
+      WALLET_SERVER_API_URL: "http://suredbits-wallet_walletserver_1:9999/"
+      WALLET_SERVER_WS: "ws://suredbits-wallet_walletserver_1:19999/events"
       TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT}
       DEFAULT_UI_PASSWORD: "none" 
       BITCOIN_S_SERVER_RPC_PASSWORD: $APP_PASSWORD
-    networks:
-      default:
-        ipv4_address: $APP_SUREDBITS_WALLET_IP
     depends_on: 
       - walletserver
   
@@ -55,9 +52,6 @@ services:
       DISABLE_JLINK: "1"
     ports:
       - "$APP_SUREDBITS_WALLET_P2P_PORT:$APP_SUREDBITS_WALLET_P2P_PORT"
-    networks:
-      default:
-        ipv4_address: $APP_SUREDBITS_WALLET_SERVER_IP
   
   tor:
     image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a
diff --git a/suredbits-wallet/exports.sh b/suredbits-wallet/exports.sh
index 7d76acc..4074875 100644
--- a/suredbits-wallet/exports.sh
+++ b/suredbits-wallet/exports.sh
@@ -1,6 +1,3 @@
-export APP_SUREDBITS_WALLET_IP="10.21.21.73"
-export APP_SUREDBITS_WALLET_PORT="3020"
-export APP_SUREDBITS_WALLET_SERVER_IP="10.21.21.74"
 export APP_SUREDBITS_WALLET_P2P_PORT="2862"
 
 suredbits_wallet_p2p_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-p2p/hostname"
diff --git a/suredbits-wallet/torrc.template b/suredbits-wallet/torrc.template
index 64000a0..beaef6e 100644
--- a/suredbits-wallet/torrc.template
+++ b/suredbits-wallet/torrc.template
@@ -1,3 +1,3 @@
 # suredbits-wallet p2p Hidden Service
 HiddenServiceDir /data/app-$APP_ID-p2p
-HiddenServicePort $APP_SUREDBITS_WALLET_P2P_PORT $APP_SUREDBITS_WALLET_SERVER_IP:$APP_SUREDBITS_WALLET_P2P_PORT
\ No newline at end of file
+HiddenServicePort $APP_SUREDBITS_WALLET_P2P_PORT suredbits-wallet_walletserver_1:$APP_SUREDBITS_WALLET_P2P_PORT
\ No newline at end of file
diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml
index b31362b..0df0b07 100644
--- a/synapse/docker-compose.yml
+++ b/synapse/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SYNAPSE_IP
+      APP_HOST: synapse_server_1
       APP_PORT: $APP_SYNAPSE_PORT
       PROXY_AUTH_ADD: "false"
 
@@ -24,6 +24,3 @@ services:
       SYNAPSE_REPORT_STATS: "yes"
       SYNAPSE_ENABLE_REGISTRATION: "yes"
       SYNAPSE_NO_TLS: "yes"
-    networks:
-      default:
-        ipv4_address: $APP_SYNAPSE_IP
diff --git a/synapse/exports.sh b/synapse/exports.sh
index 4c5653b..8007a03 100644
--- a/synapse/exports.sh
+++ b/synapse/exports.sh
@@ -1,3 +1,2 @@
-export APP_SYNAPSE_IP="10.21.21.44"
 export APP_SYNAPSE_PORT="8008"
-export APP_SYNAPSE_TOR_HS_EXTRA_PORTS="${APP_SYNAPSE_PORT}:${APP_SYNAPSE_IP}:${APP_SYNAPSE_PORT}"
\ No newline at end of file
+export APP_SYNAPSE_TOR_HS_EXTRA_PORTS="${APP_SYNAPSE_PORT}:synapse_server_1:${APP_SYNAPSE_PORT}"
\ No newline at end of file
diff --git a/syncthing/docker-compose.yml b/syncthing/docker-compose.yml
index b83f4b8..1a46fc5 100644
--- a/syncthing/docker-compose.yml
+++ b/syncthing/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_SYNCTHING_IP
-      APP_PORT: $APP_SYNCTHING_PORT
+      APP_HOST: syncthing_server_1
+      APP_PORT: 8384
 
   server:
     image: syncthing/syncthing:1.18.4@sha256:97fc6221819aceab9055d120a01d2981a30d3aef962f1ec5eda2b21cfaa883c8
@@ -17,9 +17,6 @@ services:
     volumes:
       - ${APP_DATA_DIR}/data:/var/syncthing
     ports:
-      - ${APP_SYNCTHING_SYNC_PORT}:${APP_SYNCTHING_SYNC_PORT}/tcp
-      - ${APP_SYNCTHING_SYNC_PORT}:${APP_SYNCTHING_SYNC_PORT}/udp
-    networks:
-      default:
-        ipv4_address: ${APP_SYNCTHING_IP}
+      - 22000:22000/tcp
+      - 22000:22000/udp
       
\ No newline at end of file
diff --git a/syncthing/exports.sh b/syncthing/exports.sh
deleted file mode 100644
index 612875f..0000000
--- a/syncthing/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_SYNCTHING_IP="10.21.21.61"
-export APP_SYNCTHING_PORT="8384"
-export APP_SYNCTHING_SYNC_PORT="22000"
\ No newline at end of file
diff --git a/tailscale/docker-compose.yml b/tailscale/docker-compose.yml
index 7bbb653..2b41511 100644
--- a/tailscale/docker-compose.yml
+++ b/tailscale/docker-compose.yml
@@ -6,6 +6,6 @@ services:
     image: tailscale/tailscale:v1.33.158@sha256:e5610d019e82ac1929a9318ca928f0ed4bceaeb4c47541eff690a375995866a2
     restart: on-failure
     stop_grace_period: 1m
-    command: "sh -c 'tailscale web --listen 0.0.0.0:${APP_TAILSCALE_PORT} & exec tailscaled --tun=userspace-networking'"
+    command: "sh -c 'tailscale web --listen 0.0.0.0:8240 & exec tailscaled --tun=userspace-networking'"
     volumes:
       - ${APP_DATA_DIR}/data:/var/lib
diff --git a/tailscale/exports.sh b/tailscale/exports.sh
index 5946e66..05936a1 100644
--- a/tailscale/exports.sh
+++ b/tailscale/exports.sh
@@ -1,6 +1,3 @@
-export APP_TAILSCALE_IP="10.21.21.80"
-export APP_TAILSCALE_PORT="8240"
-
 # Detect we are running in a tailscale install
 if ! cat "${UMBREL_ROOT}/db/user.json" | grep --quiet '"tailscale"'
 then
diff --git a/tallycoin-connect/docker-compose.yml b/tallycoin-connect/docker-compose.yml
index d387000..a5149db 100644
--- a/tallycoin-connect/docker-compose.yml
+++ b/tallycoin-connect/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_TALLYCOIN_CONNECT_IP
-      APP_PORT: $APP_TALLYCOIN_CONNECT_PORT
+      APP_HOST: tallycoin-connect_web_1
+      APP_PORT: 8123
 
   web:
     image: djbooth007/tallycoin_connect:v1.7.5@sha256:136b7e09e3681fa24f73176a1a68715354d2d4b0fa20ca4bbc11356ced3f0f1e
@@ -20,6 +20,3 @@ services:
       LND_TLSCERT_PATH: "/lnd/tls.cert"
       CONFIG_FILE: "/data/tallycoin_api.key"
       TALLYCOIN_PASSWD_CLEARTEXT: "$APP_PASSWORD"
-    networks:
-      default:
-        ipv4_address: $APP_TALLYCOIN_CONNECT_IP
diff --git a/tallycoin-connect/exports.sh b/tallycoin-connect/exports.sh
deleted file mode 100644
index f226724..0000000
--- a/tallycoin-connect/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_TALLYCOIN_CONNECT_IP="10.21.21.60"
-export APP_TALLYCOIN_CONNECT_PORT="8123"
\ No newline at end of file
diff --git a/thunderhub/docker-compose.yml b/thunderhub/docker-compose.yml
index 919d201..2430d80 100644
--- a/thunderhub/docker-compose.yml
+++ b/thunderhub/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_THUNDERHUB_IP
-      APP_PORT: $APP_THUNDERHUB_PORT
+      APP_HOST: thunderhub_web_1
+      APP_PORT: 3000
 
   web:
     image: apotdevin/thunderhub:v0.13.16@sha256:d45013f00eabd59aabb649bc1afb5aee40b25e96f3a86112fe7ff28cc89f5d62
@@ -22,6 +22,3 @@ services:
       ACCOUNT_CONFIG_PATH: "/data/thubConfig.yaml"
       YML_ENV_1: "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT"
       TOR_PROXY_SERVER: "socks://$TOR_PROXY_IP:$TOR_PROXY_PORT"
-    networks:
-      default:
-        ipv4_address: $APP_THUNDERHUB_IP
diff --git a/thunderhub/exports.sh b/thunderhub/exports.sh
deleted file mode 100644
index 99498ff..0000000
--- a/thunderhub/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_THUNDERHUB_IP="10.21.21.13"
-export APP_THUNDERHUB_PORT="3000"
\ No newline at end of file
diff --git a/transmission/docker-compose.yml b/transmission/docker-compose.yml
index f50618f..d24bcf0 100644
--- a/transmission/docker-compose.yml
+++ b/transmission/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_TRANSMISSION_IP
+      APP_HOST: transmission_server_1
       APP_PORT: 9091
 
   server:
@@ -18,6 +18,3 @@ services:
       - 51413:51413
       - 51413:51413/udp
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: $APP_TRANSMISSION_IP
diff --git a/transmission/exports.sh b/transmission/exports.sh
deleted file mode 100644
index 983579b..0000000
--- a/transmission/exports.sh
+++ /dev/null
@@ -1 +0,0 @@
-export APP_TRANSMISSION_IP="10.21.25.3"
\ No newline at end of file
diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml
index b63a92c..2dca88c 100644
--- a/uptime-kuma/docker-compose.yml
+++ b/uptime-kuma/docker-compose.yml
@@ -3,15 +3,12 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_UPTIME_KUMA_IP
+      APP_HOST: uptime-kuma_server_1
       APP_PORT: 3001
 
-  uptime-kuma:
+  server:
     image: louislam/uptime-kuma:1.18.5@sha256:a84767d7934f833010b886f3dfc57b9d23ca69e85e48f378b28b5c25c5043e1d
     restart: on-failure
     stop_grace_period: 1m
     volumes:
       - ${APP_DATA_DIR}/data/uptime-kuma:/app/data
-    networks:
-      default:
-        ipv4_address: $APP_UPTIME_KUMA_IP
diff --git a/uptime-kuma/exports.sh b/uptime-kuma/exports.sh
deleted file mode 100644
index 98b84df..0000000
--- a/uptime-kuma/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_UPTIME_KUMA_PORT="8385"
-export APP_UPTIME_KUMA_IP="10.21.21.62"
\ No newline at end of file
diff --git a/urbit/docker-compose.yml b/urbit/docker-compose.yml
index 4ceb7a1..ab8334f 100644
--- a/urbit/docker-compose.yml
+++ b/urbit/docker-compose.yml
@@ -2,19 +2,16 @@ version: "3.3"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_URBIT_IP
+      APP_HOST: urbit_manager_1
       APP_PORT: 8090
 
   manager:
     image: mopfelwinrux/urbit-umbrel:v0.4.1@sha256:083db8cdb2109f29c65e186b47eeecdacd5d8021ce1c4593cf8a9f945f646171
     ports:
-      - "${APP_URBIT_P2P_PORT}:34343"
+      - "34343:34343"
     volumes:
       - ${APP_DATA_DIR}/piers:/data/piers
       - ${APP_DATA_DIR}/keys:/data/keys
     environment:
       FLASK_APP: app
       APP_PASSWORD: ${APP_PASSWORD}
-    networks:
-      default:
-        ipv4_address: $APP_URBIT_IP
diff --git a/urbit/exports.sh b/urbit/exports.sh
deleted file mode 100644
index c33e9fa..0000000
--- a/urbit/exports.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export APP_URBIT_IP="10.21.21.76"
-export APP_URBIT_PORT="8090"
-export APP_URBIT_P2P_PORT="34343"
-export APP_URBIT_BITCOIN_CONNECTOR_IP="10.21.21.81"
-export APP_URBIT_BITCOIN_CONNECTOR_PORT="9090"
-export APP_URBIT_BITCOIN_CONNECTOR_SERVER_PORT="55555"
\ No newline at end of file
diff --git a/urbit/torrc.template b/urbit/torrc.template
deleted file mode 100644
index 9164508..0000000
--- a/urbit/torrc.template
+++ /dev/null
@@ -1,7 +0,0 @@
-# urbit-bitcoin-connector Hidden Service
-HiddenServiceDir /data/app-urbit-bitcoin-connector
-HiddenServicePort 80 $APP_URBIT_BITCOIN_CONNECTOR_IP:$APP_URBIT_BITCOIN_CONNECTOR_PORT
-
-# urbit Hidden Service
-HiddenServiceDir /data/app-urbit
-HiddenServicePort 80 $APP_URBIT_IP:$APP_URBIT_PORT
\ No newline at end of file
diff --git a/usocial/docker-compose.yml b/usocial/docker-compose.yml
index b752628..f9e2649 100644
--- a/usocial/docker-compose.yml
+++ b/usocial/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_USOCIAL_IP
+      APP_HOST: usocial_web_1
       APP_PORT: 5000
 
   web:
@@ -19,9 +19,6 @@ services:
         LND_IP: "${APP_LIGHTNING_NODE_IP}"
         LND_GRPC_PORT: ${APP_LIGHTNING_NODE_GRPC_PORT}
         LND_DIR: "/lnd"
-    networks:
-      default:
-          ipv4_address: $APP_USOCIAL_IP
   
   fetcher:
     depends_on:
@@ -33,6 +30,3 @@ services:
       - ${APP_DATA_DIR}/data:/instance
     environment:
         USOCIAL_JOB: "FETCH_FEEDS"
-    networks:
-      default:
-          ipv4_address: $APP_USOCIAL_FETCHER_IP
diff --git a/usocial/exports.sh b/usocial/exports.sh
deleted file mode 100644
index 4d582be..0000000
--- a/usocial/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_USOCIAL_IP="10.21.21.77"
-export APP_USOCIAL_PORT="8448"
-export APP_USOCIAL_FETCHER_IP="10.21.21.78"
\ No newline at end of file
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 910875b..195be52 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_VAULTWARDEN_IP
-      APP_PORT: $APP_VAULTWARDEN_PORT
+      APP_HOST: vaultwarden_server_1
+      APP_PORT: 8089
       PROXY_AUTH_ADD: "false"
 
   server:
@@ -15,7 +15,4 @@ services:
     volumes:
       - ${APP_DATA_DIR}/data:/data
     environment:
-      ROCKET_PORT: "${APP_VAULTWARDEN_PORT}"
-    networks:
-      default:
-        ipv4_address: $APP_VAULTWARDEN_IP
+      ROCKET_PORT: 8089
diff --git a/vaultwarden/exports.sh b/vaultwarden/exports.sh
deleted file mode 100644
index ee39f9a..0000000
--- a/vaultwarden/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_VAULTWARDEN_IP="10.21.21.46"
-export APP_VAULTWARDEN_PORT="8089"
\ No newline at end of file
diff --git a/whoogle-search/docker-compose.yml b/whoogle-search/docker-compose.yml
index a702216..fa7b9bd 100644
--- a/whoogle-search/docker-compose.yml
+++ b/whoogle-search/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_WHOOGLE_SEARCH_IP
-      APP_PORT: $APP_WHOOGLE_SEARCH_PORT
+      APP_HOST: whoogle-search_web_1
+      APP_PORT: 6420
 
   web:
     image: benbusby/whoogle-search:0.7.4@sha256:8526a3272d992ea2c240919b8b5dafee2b37eab28af7df4f175054ef29d8b65d
@@ -13,7 +13,4 @@ services:
     init: true
     user: "927:927"
     environment:
-      EXPOSE_PORT: $APP_WHOOGLE_SEARCH_PORT
-    networks:
-      default:
-        ipv4_address: $APP_WHOOGLE_SEARCH_IP
+      EXPOSE_PORT: 6420
diff --git a/whoogle-search/exports.sh b/whoogle-search/exports.sh
deleted file mode 100644
index 7402c04..0000000
--- a/whoogle-search/exports.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export APP_WHOOGLE_SEARCH_IP="10.21.21.107"
-export APP_WHOOGLE_SEARCH_PORT="6420"
\ No newline at end of file
diff --git a/woofbot/docker-compose.yml b/woofbot/docker-compose.yml
index 6f4ad09..082e49f 100644
--- a/woofbot/docker-compose.yml
+++ b/woofbot/docker-compose.yml
@@ -3,25 +3,24 @@ version: "3.7"
 services:
   app_proxy:
     environment:
-      APP_HOST: $APP_WOOFBOT_WEB_IP
+      APP_HOST: woofbot_web_1
       APP_PORT: 8080
+  
   web:
     image: woofbot/woofbot:v0.4.0@sha256:f84754c41668d256a917553a36e9b7e34241eedb541507a036ccd713a1a196b9
     restart: on-failure
     stop_grace_period: 1m
     environment:
-      MONGODB_URI: "mongodb://${APP_WOOFBOT_DATABASE_IP}:27017/woofbot"
+      MONGODB_URI: "mongodb://woofbot_mongodb_1:27017/woofbot"
       APP_PORT: "8080"
       APP_SEED: $APP_SEED
       APP_BITCOIN_NODE_IP: $APP_BITCOIN_NODE_IP
       APP_BITCOIN_RPC_USER: $APP_BITCOIN_RPC_USER
       APP_BITCOIN_RPC_PASS: $APP_BITCOIN_RPC_PASS
       APP_BITCOIN_RPC_PORT: $APP_BITCOIN_RPC_PORT
-    networks:
-      default:
-        ipv4_address: $APP_WOOFBOT_WEB_IP
     depends_on:
       - mongodb
+  
   mongodb:
     # Newer mongo versions don't support Raspberry Pi 4 arm64
     image: mongo:4.4.6-bionic@sha256:3d0e6df9fd5bc42cbf8ef8bc9e6c4e78f6f26c7157dbd7bdec72d202ab8ebe3a
@@ -32,6 +31,3 @@ services:
       - ${APP_DATA_DIR}/data/db:/data/db
       - ${APP_DATA_DIR}/data/db/diagnostic.data:/data/db/diagnostic.data
       - ${APP_DATA_DIR}/data/db/journal:/data/db/journal
-    networks:
-      default:
-        ipv4_address: $APP_WOOFBOT_DATABASE_IP
diff --git a/woofbot/exports.sh b/woofbot/exports.sh
deleted file mode 100644
index a7d7254..0000000
--- a/woofbot/exports.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export APP_WOOFBOT_WEB_IP="10.21.21.100"
-export APP_WOOFBOT_WEB_PORT="8092"
-export APP_WOOFBOT_DATABASE_IP="10.21.21.101"