diff --git a/etc/docker/docker-compose.infrastructure.override.yml b/etc/docker/docker-compose.infrastructure.override.yml
index 2718b03..6d5d6ef 100644
--- a/etc/docker/docker-compose.infrastructure.override.yml
+++ b/etc/docker/docker-compose.infrastructure.override.yml
@@ -3,4 +3,7 @@ version: '3.7'
 services:
   redis:
     ports:
-      - "6379:6379"
\ No newline at end of file
+      - "6379:6379"
+  postgresql:
+    ports: 
+      - "5432:5432"
\ No newline at end of file
diff --git a/etc/docker/docker-compose.infrastructure.yml b/etc/docker/docker-compose.infrastructure.yml
index 5c6e628..146af9c 100644
--- a/etc/docker/docker-compose.infrastructure.yml
+++ b/etc/docker/docker-compose.infrastructure.yml
@@ -5,7 +5,15 @@ services:
     image: redis:6.0.10-alpine
     networks:
       - eventhub-network      
-      
+  postgresql:
+    image: postgres
+    restart: always
+    environment: 
+      POSTGRES_USER: "root"
+      POSTGRES_PASSWORD: "root"
+    networks: 
+      - eventhub-network
+
 networks:
   eventhub-network:
     external: true
\ No newline at end of file
diff --git a/src/EventHub.BackgroundServices/appsettings.json b/src/EventHub.BackgroundServices/appsettings.json
index a450404..9c5c6b9 100644
--- a/src/EventHub.BackgroundServices/appsettings.json
+++ b/src/EventHub.BackgroundServices/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=EventHub;Username=postgres;Password=1q2w3E*"
+    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/src/EventHub.DbMigrator/appsettings.json b/src/EventHub.DbMigrator/appsettings.json
index c7b43b0..828fd62 100644
--- a/src/EventHub.DbMigrator/appsettings.json
+++ b/src/EventHub.DbMigrator/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=EventHub;Username=postgres;Password=1q2w3E*"
+    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"
   },
   "IdentityServer": {
     "Clients": {
diff --git a/src/EventHub.HttpApi.Host/appsettings.json b/src/EventHub.HttpApi.Host/appsettings.json
index bcb9d22..472e591 100644
--- a/src/EventHub.HttpApi.Host/appsettings.json
+++ b/src/EventHub.HttpApi.Host/appsettings.json
@@ -3,7 +3,7 @@
     "CorsOrigins": "https://*.EventHub.com,https://localhost:44307,https://localhost:44308"
   },
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=EventHub;Username=postgres;Password=1q2w3E*"
+    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"
   },
   "Redis": {
     "Configuration": "127.0.0.1"
diff --git a/src/EventHub.IdentityServer/appsettings.json b/src/EventHub.IdentityServer/appsettings.json
index 6b7f184..c9e8b26 100644
--- a/src/EventHub.IdentityServer/appsettings.json
+++ b/src/EventHub.IdentityServer/appsettings.json
@@ -5,7 +5,7 @@
     "RedirectAllowedUrls": "http://localhost:4200,https://localhost:44307"
   },
   "ConnectionStrings": {
-    "Default": "Host=localhost;Database=EventHub;Username=postgres;Password=1q2w3E*"
+    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"
   },
   "Redis": {
     "Configuration": "127.0.0.1"