diff --git a/admin/.env b/admin/.env
index d6bdd83..af2a298 100755
--- a/admin/.env
+++ b/admin/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/archivebox/.env b/archivebox/.env
index bc81daf..b70245b 100755
--- a/archivebox/.env
+++ b/archivebox/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/filebrowser/.env b/filebrowser/.env
index a7ced8e..b70245b 100755
--- a/filebrowser/.env
+++ b/filebrowser/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=ProxyServer
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/homepage/.env b/homepage/.env
index 8f93ae8..a7092e0 100755
--- a/homepage/.env
+++ b/homepage/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=ProxyServer
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
@@ -46,7 +46,7 @@ HOMEPAGE_VAR_NGINXPROXYMANAGER_USERNAME=akanealw@gmail.com
 HOMEPAGE_VAR_NGINXPROXYMANAGER_PASSWORD=kDhi*NTHDzynCPPcZjY8
 
 # GLUETUN
-HOMEPAGE_VAR_GLUETUN_URL=http://192.168.1.31:8777
+HOMEPAGE_VAR_GLUETUN_URL=http://192.168.1.30:8777
 
 
 # ADGUARD HOME
diff --git a/mixed/.env b/mixed/.env
index bc81daf..b70245b 100755
--- a/mixed/.env
+++ b/mixed/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/olivetin/.env b/olivetin/.env
index bc81daf..b70245b 100755
--- a/olivetin/.env
+++ b/olivetin/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/paperlessngx/.env b/paperlessngx/.env
index 4b03175..2b158ec 100755
--- a/paperlessngx/.env
+++ b/paperlessngx/.env
@@ -3,10 +3,10 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer2
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
-SERVERIP=192.168.1.32
+SERVERIP=192.168.1.30
 PGID=1000
 PUID=1000
 UMASK=000
diff --git a/photoprism/.env b/photoprism/.env
index 9d989cf..568141d 100755
--- a/photoprism/.env
+++ b/photoprism/.env
@@ -3,10 +3,10 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer2
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
-SERVERIP=192.168.1.32
+SERVERIP=192.168.1.30
 PGID=1000
 PUID=1000
 UMASK=000
diff --git a/rss-bridge/.env b/rss-bridge/.env
index 7bb54ee..a9ecade 100755
--- a/rss-bridge/.env
+++ b/rss-bridge/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer2
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/ryot/.env b/ryot/.env
index 21f87cc..c4f198d 100755
--- a/ryot/.env
+++ b/ryot/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/shlink/.env b/shlink/.env
index 7bb54ee..a9ecade 100755
--- a/shlink/.env
+++ b/shlink/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer2
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/vaultwarden/.env b/vaultwarden/.env
index bc81daf..b70245b 100755
--- a/vaultwarden/.env
+++ b/vaultwarden/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000
diff --git a/vpn/.env b/vpn/.env
index bc81daf..b70245b 100755
--- a/vpn/.env
+++ b/vpn/.env
@@ -3,7 +3,7 @@ COMPOSE_HTTP_TIMEOUT=120
 COMPOSE_IGNORE_ORPHANS=1
 DOCKER_CONFIGS=.
 DOCKERGID=999
-DOCKERHOSTNAME=DockerServer1
+DOCKERHOSTNAME=DockerServer
 DOCKERLOGGING_MAXFILE=10
 DOCKERLOGGING_MAXSIZE=200k
 PGID=1000