diff --git a/etc/docker/docker-compose.infrastructure.override.yml b/etc/docker/docker-compose.infrastructure.override.yml
index 3ae3deb5..22018264 100644
--- a/etc/docker/docker-compose.infrastructure.override.yml
+++ b/etc/docker/docker-compose.infrastructure.override.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   rabbitmq:
@@ -18,6 +18,7 @@ services:
     ports:
       - "5432:5432"
     environment:
+      POSTGRES_DB: keycloak
       POSTGRES_PASSWORD: "myPassw0rd"
 
   pgadmin:
@@ -26,3 +27,14 @@ services:
     environment:
       PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL:-pgadmin4@pgadmin.org}
       PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-admin}
+
+  keycloak:
+    ports:
+      - "44320:8080"
+    environment:
+      DB_VENDOR: postgres
+      DB_ADDR: "postgres-db"
+      DB_DATABASE: "keycloak"
+      DB_USER: "postgres"
+      DB_PASSWORD: "myPassw0rd"
+    
\ No newline at end of file
diff --git a/etc/docker/docker-compose.infrastructure.yml b/etc/docker/docker-compose.infrastructure.yml
index 547b3aae..800073f8 100644
--- a/etc/docker/docker-compose.infrastructure.yml
+++ b/etc/docker/docker-compose.infrastructure.yml
@@ -1,4 +1,4 @@
-version: '3.7'
+version: '3.8'
 
 services:
   rabbitmq:
@@ -46,12 +46,21 @@ services:
       - eshoponabp-network
   
   pgadmin:
-    container_name: pgadmin_container
+    container_name: pgadmin
     image: dpage/pgadmin4:6.2    
     volumes:
        - pgadmin_data:/var/lib/pgadmin
     networks: 
-      - eshoponabp-network   
+      - eshoponabp-network
+
+  keycloak:
+    container_name: keycloak
+    image: jboss/keycloak:13.0.0
+    depends_on:
+      - postgres-db  
+    restart: unless-stopped
+    networks:
+      - eshoponabp-network
 
 volumes:
   postgres_data: