diff --git a/etc/abp-studio/run-profiles/Default.abprun.json b/etc/abp-studio/run-profiles/Default.abprun.json
index 5ed56f6..8727e4f 100644
--- a/etc/abp-studio/run-profiles/Default.abprun.json
+++ b/etc/abp-studio/run-profiles/Default.abprun.json
@@ -42,5 +42,12 @@
       "Admin": {},
       "Public": {}
     }
+  },
+  "containers": {
+    "files": {
+      "../../docker/infrastructure/redis.yml": {},
+      "../../docker/infrastructure/postgres.yml": {}
+    },
+    "serviceName": "EventHub"
   }
 }
\ No newline at end of file
diff --git a/etc/docker/docker-compose.infrastructure.override.yml b/etc/docker/docker-compose.infrastructure.override.yml
deleted file mode 100644
index 6d5d6ef..0000000
--- a/etc/docker/docker-compose.infrastructure.override.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3.7'
-
-services:
-  redis:
-    ports:
-      - "6379:6379"
-  postgresql:
-    ports: 
-      - "5432:5432"
\ No newline at end of file
diff --git a/etc/docker/down.ps1 b/etc/docker/down.ps1
index 87b1859..52098d9 100644
--- a/etc/docker/down.ps1
+++ b/etc/docker/down.ps1
@@ -1 +1 @@
-docker-compose -f docker-compose.infrastructure.yml -f docker-compose.infrastructure.override.yml down
\ No newline at end of file
+docker-compose -f infrastructure/posgres.yml -f infrastructure/redis.yml down
\ No newline at end of file
diff --git a/etc/docker/docker-compose.infrastructure.yml b/etc/docker/infrastructure/postgres.yml
similarity index 61%
rename from etc/docker/docker-compose.infrastructure.yml
rename to etc/docker/infrastructure/postgres.yml
index 146af9c..7840e38 100644
--- a/etc/docker/docker-compose.infrastructure.yml
+++ b/etc/docker/infrastructure/postgres.yml
@@ -1,19 +1,18 @@
 version: '3.7'
 
+networks:
+  eventhub-network:
+    external: true
+
 services:
-  redis:
-    image: redis:6.0.10-alpine
-    networks:
-      - eventhub-network      
   postgresql:
+    container_name: postgres
     image: postgres
     restart: always
+    ports: 
+      - "5432:5432"
     environment: 
       POSTGRES_USER: "root"
       POSTGRES_PASSWORD: "root"
     networks: 
-      - eventhub-network
-
-networks:
-  eventhub-network:
-    external: true
\ No newline at end of file
+      - eventhub-network
\ No newline at end of file
diff --git a/etc/docker/infrastructure/redis.yml b/etc/docker/infrastructure/redis.yml
new file mode 100644
index 0000000..201fee5
--- /dev/null
+++ b/etc/docker/infrastructure/redis.yml
@@ -0,0 +1,14 @@
+version: '3.7'
+
+networks:
+  eventhub-network:
+    external: true
+
+services:
+  redis:
+    container_name: redis
+    image: redis:6.0.10-alpine
+    ports:
+      - "6379:6379"
+    networks:
+      - eventhub-network
diff --git a/etc/docker/up.ps1 b/etc/docker/up.ps1
index 10ea451..4e97c0b 100644
--- a/etc/docker/up.ps1
+++ b/etc/docker/up.ps1
@@ -1,2 +1,2 @@
 docker network create eventhub-network
-docker-compose -f docker-compose.infrastructure.yml -f docker-compose.infrastructure.override.yml up -d --remove-orphans
\ No newline at end of file
+docker-compose -f infrastructure/posgres.yml -f infrastructure/redis.yml up -d --remove-orphans
\ No newline at end of file