diff --git a/.env b/.env
index 3428096..5f0c8f9 100644
--- a/.env
+++ b/.env
@@ -37,6 +37,12 @@ POSTGRES_DB=orthanc
 POSTGRES_PORT=5432
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=password
+PGPASSWORD=secret
 
 TZ="Asia/Dhaka"
-PGTZ="Asia/Dhaka"
\ No newline at end of file
+PGTZ="Asia/Dhaka"
+
+PGADMIN_MAIL=admin@blackfish.dev
+PGADMIN_PASS=secret
+PGADMIN_SERVER=False
+PGADMIN_MASTER_PASS=False
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e42cdc..d73967f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,31 +5,33 @@ services:
     container_name: postgres
     networks:
       - pacs
-    volumes:
-      - ${POSTGRES_DATA_MNT}:${PGDATA}
     environment:
-      - PGPASSWORD='secret'
+      - PGPASSWORD=${PGPASSWORD}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=${POSTGRES_DB}
       - PGDATA=${PGDATA}
       - PGTZ=${PGTZ}
+    volumes:
+      - ${POSTGRES_DATA_MNT}:${PGDATA}
     healthcheck:
       test: [ "CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}" ]
       retries: 3
       timeout: 5s
 
   pgadmin:
-    depends_on:
-      - postgres
     container_name: pgadmin
-    image: dpage/pgadmin4
+    image: dpage/pgadmin4:latest
     restart: unless-stopped
     environment:
-      PGADMIN_DEFAULT_EMAIL: admin@blackfish.dev
-      PGADMIN_DEFAULT_PASSWORD: password
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_MAIL}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_PASS}
+      - PGADMIN_CONFIG_SERVER_MODE=${PGADMIN_SERVER}
+      - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=${PGADMIN_MASTER_PASS}
     ports:
-      - 5050:88
+      - "5050:5050"
+    depends_on:
+      - postgres
 
   orthanc:
     container_name: orthanc
@@ -38,9 +40,7 @@ services:
       - 8042:8042
       - 4242:4242
     volumes:
-      # configuration file
       - ${ORTHANC_CONFIG:-./config/orthanc.json}:/etc/orthanc/orthanc.json:ro
-      # storage volume for raw dicoms
       - ${ORTHANC_DB_MNT:-./volumes/orthanc_db}:/var/lib/orthanc/db
       - ${ORTHANC_OHIF:-./config/orthanc_ohif.js}:/usr/local/share/orthanc/ohif.js:ro
       - ${ORTHANC_LOG:-./volumes/orthanc_logs}:/etc/orthanc/logs
@@ -58,7 +58,7 @@ services:
 
   ohif:
     container_name: ohif
-    image: ohif/viewer
+    image: ohif/app:v3.9.2
     ports:
       - 3000:80
     environment: