diff --git a/.env.example b/.env.example
index 4270084..ec36869 100644
--- a/.env.example
+++ b/.env.example
@@ -114,6 +114,7 @@ PGADMIN_DB_HOST="'postgresql://${PGADMING_DB_USER}:${PGADMIN_DB_PASSWORD}@${DB_H
 PGADMIN_EMAIL=pgadmin@example.com
 PGADMIN_PASSWORD=pgadmin
 
+# To import servers use /pgadmin4/servers.json on first build, then remove.
 PGADMIN_SERVERS_JSON=
 PGADMIN_CONFIG_SERVER_MODE=True
 
@@ -151,7 +152,7 @@ MINIO_TAG=latest
 NGINX_TAG=1.25.3
 NGINX_PROXY_TAG=1.4.0
 ACME_COMPANION_TAG=2.2.9
-PGADMIN_TAG=8.0
+PGADMIN_TAG=8.1
 
 # Odoocker paths
 COMMUNITY_ADDONS=${ROOT_PATH}/addons
diff --git a/docker-compose.override.local.yml b/docker-compose.override.local.yml
index b5363f4..690dc5c 100644
--- a/docker-compose.override.local.yml
+++ b/docker-compose.override.local.yml
@@ -20,3 +20,15 @@ services:
     ports:
       - 80:80
       - 443:443
+
+  letsencrypt:
+    restart: 'no'
+
+  redis:
+    restart: 'no'
+
+  s3:
+    restart: 'no'
+
+  pgadmin:
+    restart: 'no'
diff --git a/docker-compose.override.production.yml b/docker-compose.override.production.yml
index 81e0e77..4aa221d 100644
--- a/docker-compose.override.production.yml
+++ b/docker-compose.override.production.yml
@@ -20,3 +20,15 @@ services:
     ports:
       - 80:80
       - 443:443
+
+  letsencrypt:
+    restart: unless-stopped
+
+  redis:
+    restart: unless-stopped
+
+  s3:
+    restart: unless-stopped
+
+  pgadmin:
+    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 4151c34..6fa4c7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -173,7 +173,9 @@ services:
       dockerfile: ./pgadmin/Dockerfile
       args:
         - PGADMIN_TAG
-    restart: 'no'
+    depends_on:
+      - postgres
+      - nginx-proxy
     expose:
       - 80
     volumes: