diff --git a/etc/docker/docker-compose.infrastructure.override.yml b/etc/docker/docker-compose.infrastructure.override.yml
index fed3bf2c..9a7c285a 100644
--- a/etc/docker/docker-compose.infrastructure.override.yml
+++ b/etc/docker/docker-compose.infrastructure.override.yml
@@ -15,3 +15,10 @@ services:
       - "5432:5432"
     environment:
       POSTGRES_PASSWORD: "myPassw0rd"
+
+  pgadmin:
+    ports:
+      - "${PGADMIN_PORT:-5050}:80"
+    environment:
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
diff --git a/etc/docker/docker-compose.infrastructure.yml b/etc/docker/docker-compose.infrastructure.yml
index 7f561838..3eea4369 100644
--- a/etc/docker/docker-compose.infrastructure.yml
+++ b/etc/docker/docker-compose.infrastructure.yml
@@ -17,12 +17,21 @@ services:
     container_name: postgres-db
     image: postgres:14.1
     volumes:
-      - sqldata:/var/opt/postgres
+      - postgres_data:/var/opt/postgres
     networks: 
       - eshoponabp-network
-      
+  
+  pgadmin:
+    container_name: pgadmin_container
+    image: dpage/pgadmin4:6.2    
+    volumes:
+       - pgadmin_data:/var/lib/pgadmin
+    networks: 
+      - eshoponabp-network   
+
 volumes:
-  sqldata:
+  postgres_data:
+  pgadmin_data:
 
 networks:
   eshoponabp-network:
diff --git a/run-tye.ps1 b/run-tye.ps1
index dde3af14..27dd2bdf 100644
--- a/run-tye.ps1
+++ b/run-tye.ps1
@@ -12,7 +12,7 @@ if (! (  Test-Path ".\etc\dev-cert\localhost.pfx" -PathType Leaf ) ){
 docker network create eshoponabp-network
 
 $requiredServices = @(
-	'sql-server-db',
+	'postgres-db',
 	'rabbitmq',
 	'redis'
 )