diff --git a/docker-compose.yaml b/docker-compose.yaml
index f8cb6ed..9eb1198 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
     restart: unless-stopped
   postgres:
     image: postgres:15-alpine
-    container_name: cftunnel-db
+    container_name: cftunnel-db-${ENV}
     environment:
       POSTGRES_DB: cftunnel
       POSTGRES_USER: ${POSTGRES_USERNAME}
diff --git a/postgres-docker-compose.yaml b/postgres-docker-compose.yaml
new file mode 100644
index 0000000..b72cc0d
--- /dev/null
+++ b/postgres-docker-compose.yaml
@@ -0,0 +1,16 @@
+services:
+  postgres:
+    image: postgres
+    container_name: cftunnel-db
+    restart: always
+    environment:
+      POSTGRES_DB: cftunnel
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: password
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+
+volumes:
+  pgdata:
\ No newline at end of file