diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index ae0f5423..1a9ca229 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -22,17 +22,16 @@ services:
       - ./migrations/before:/docker-entrypoint-initdb.d
 
   pgadmin:
-    build:
-      context: .
-      dockerfile: docker/pgadmin.Dockerfile
+    image: dpage/pgadmin4
     depends_on:
       - postgres
     environment:
       - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-      - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False
     ports:
       - 5400:80
+    volumes:
+      - ./docker/pgadmin/servers.json:/pgadmin4/servers.json
 
   redis:
     image: redis
diff --git a/docker-compose.yml b/docker-compose.yml
index 287c5298..b4f8f206 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,17 +36,16 @@ services:
       - ./migrations/before:/docker-entrypoint-initdb.d
 
   pgadmin:
-    build:
-      context: .
-      dockerfile: docker/pgadmin.Dockerfile
+    image: dpage/pgadmin4
     depends_on:
       - postgres
     environment:
       - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL}
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
-      - PGADMIN_CONFIG_WTF_CSRF_ENABLED=False
     ports:
       - 5400:80
+    volumes:
+      - ./docker/pgadmin/servers.json:/pgadmin4/servers.json
 
   redis:
     image: redis
diff --git a/docker/pgadmin.Dockerfile b/docker/pgadmin.Dockerfile
deleted file mode 100644
index 9e124dd0..00000000
--- a/docker/pgadmin.Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM dpage/pgadmin4
-
-COPY ./docker/pgadmin/servers.json /pgadmin4/servers.json
-COPY ./docker/pgadmin/custom_entrypoint.sh /custom_entrypoint.sh
-
-USER root
-RUN chmod +x /custom_entrypoint.sh
-
-USER pgadmin
-
-ENTRYPOINT ["/custom_entrypoint.sh"]
diff --git a/docker/pgadmin/custom_entrypoint.sh b/docker/pgadmin/custom_entrypoint.sh
deleted file mode 100755
index 8cd3dfab..00000000
--- a/docker/pgadmin/custom_entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Call the original entrypoint
-/entrypoint.sh "$@"
-
-# Your additional commands to invoke setup.py (example below, adjust accordingly)
-python setup.py --load-servers /path/to/your/servers.json
-
-# Keep container running
-tail -f /dev/null
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index d01a8c4e..dcf0a209 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -41,7 +41,10 @@ http {
 	# PgAdmin
         location /pgadmin/ {
             proxy_set_header X-Script-Name /pgadmin;
+            proxy_set_header X-Scheme $scheme;
+            proxy_set_header Host $host;
             proxy_pass http://pgadmin:80/;
+            proxy_redirect off;
         }
 
 	# Admin Frontend