diff --git a/docker/PrivateBin/behind-proxy-with-db/compose.override.yml b/docker/PrivateBin/behind-proxy-with-db/compose.override.yml
index 130ca71..29582f0 100644
--- a/docker/PrivateBin/behind-proxy-with-db/compose.override.yml
+++ b/docker/PrivateBin/behind-proxy-with-db/compose.override.yml
@@ -14,9 +14,11 @@ services:
         depends_on:
             db:
                 condition: service_healthy
+        networks:
+            - ${PRIVATEBINDB_NETWORk_ID}
     db:
         image: ${PRIVATEBINDB_IMAGE}:${PRIVATEBINDB_TAG}
         container_name: ${PRIVATEBINDB_CONTAINER_NAME}
         restart: ${PRIVATEBINDB_RESTART_POLICY}
         networks:
-            - ${PRIVATEBIN_NETWORk_ID}
\ No newline at end of file
+            - ${PRIVATEBINDB_NETWORk_ID}
\ No newline at end of file
diff --git a/docker/PrivateBin/behind-proxy-with-db/compose.yaml b/docker/PrivateBin/behind-proxy-with-db/compose.yaml
index 6fc3f29..4b606b6 100644
--- a/docker/PrivateBin/behind-proxy-with-db/compose.yaml
+++ b/docker/PrivateBin/behind-proxy-with-db/compose.yaml
@@ -2,8 +2,8 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
+  - ../../compose/networks/${PRIVATEBINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/privatebin.yaml
diff --git a/docker/PrivateBin/behind-proxy/compose.yaml b/docker/PrivateBin/behind-proxy/compose.yaml
index 6ae8ab1..eb7678d 100644
--- a/docker/PrivateBin/behind-proxy/compose.yaml
+++ b/docker/PrivateBin/behind-proxy/compose.yaml
@@ -2,7 +2,6 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/privatebin.yaml
diff --git a/docker/PrivateBin/compose.yaml b/docker/PrivateBin/compose.yaml
index 39da201..eb7678d 100644
--- a/docker/PrivateBin/compose.yaml
+++ b/docker/PrivateBin/compose.yaml
@@ -2,6 +2,6 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/privatebin.yaml
diff --git a/docker/PrivateBin/with-db/compose.yml b/docker/PrivateBin/with-db/compose.yml
index d3ec4a5..ba5f492 100644
--- a/docker/PrivateBin/with-db/compose.yml
+++ b/docker/PrivateBin/with-db/compose.yml
@@ -2,8 +2,8 @@ name: privatebin
 # Docker Compose v2.20 or greater required to use "include"
 include:
 #################### NETWORKS ####################
-  - ../../compose/networks/proxy.yaml
-  - ../../compose/networks/socket-proxy.yaml
+  - ../../compose/networks/${PRIVATEBIN_NETWORk_ID}.yaml
+  - ../../compose/networks/${PRIVATEBINDB_NETWORk_ID}.yaml
 #################### SERVICES ####################
   - ../../compose/postgres.yaml
   - ../../compose/privatebin.yaml
diff --git a/docker/env/privatebin-db.env b/docker/env/privatebin-db.env
new file mode 100644
index 0000000..2bb7558
--- /dev/null
+++ b/docker/env/privatebin-db.env
@@ -0,0 +1,7 @@
+PRIVATEBINDB_NETWORk_ID=backend
+
+##### Privatebin DB Container
+PRIVATEBINDB_CONTAINER_NAME=yeetfiledb
+PRIVATEBINDB_IMAGE=postgres
+PRIVATEBINDB_TAG=16-alpine
+PRIVATEBINDB_RESTART_POLICY=unless-stopped
diff --git a/docker/env/privatebin-stack.env b/docker/env/privatebin-stack.env
index edea205..1e4a118 100644
--- a/docker/env/privatebin-stack.env
+++ b/docker/env/privatebin-stack.env
@@ -1,15 +1,9 @@
 PRIVATEBIN_NETWORk_ID=proxy
 PRIVATEBIN_HOSTNAME=privatebin
 
-##### YeetFile Container
+##### Privatebin Container
 PRIVATEBIN_CONTAINER_NAME=privatebin
 PRIVATEBIN_IMAGE=privatebin/nginx-fpm-alpine
 #PRIVATEBIN_IMAGE=privatebin/pdo
 PRIVATEBIN_TAG=stable
 PRIVATEBIN_RESTART_POLICY=unless-stopped
-
-##### YeetFile DB Container
-PRIVATEBINDB_CONTAINER_NAME=yeetfiledb
-PRIVATEBINDB_IMAGE=postgres
-PRIVATEBINDB_TAG=16-alpine
-PRIVATEBINDB_RESTART_POLICY=unless-stopped