diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 84cf109c..1a9ca229 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -22,9 +22,7 @@ services:
       - ./migrations/before:/docker-entrypoint-initdb.d
 
   pgadmin:
-    build:
-      context: .
-      dockerfile: docker/pgadmin.Dockerfile
+    image: dpage/pgadmin4
     depends_on:
       - postgres
     environment:
@@ -32,6 +30,8 @@ services:
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
     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 cca4a1fc..b4f8f206 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,9 +36,7 @@ services:
       - ./migrations/before:/docker-entrypoint-initdb.d
 
   pgadmin:
-    build:
-      context: .
-      dockerfile: docker/pgadmin.Dockerfile
+    image: dpage/pgadmin4
     depends_on:
       - postgres
     environment:
@@ -46,6 +44,8 @@ services:
       - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD}
     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