diff --git a/docker-compose.yml b/docker-compose.yml
index 73a5bc5c..823357de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,26 @@
 services:
 
   redis:
-    image: "redis:alpine"
+    image: redis:alpine
     container_name: calliope-redis
     ports:
-      - "6379:6379"
+      - "6379"
+    expose:
+      - "6379"
+    command: --port 6379
 
   postgres:
     image: "postgres:12.2-alpine"
     container_name: calliope-postgres
     restart: always
+    env_file:
+      - .envs/.local
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
     ports:
       - "5433:5432"
     volumes:
-      - ./postgres/data:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql/data
 
   short_worker:
     platform: linux/x86_64
@@ -95,6 +100,6 @@ services:
       - celery_flower
     command: ["./wait-for-postgres.sh", "compose/run-calliope-app.sh"]
 
-
 volumes:
-  data:
+  postgres:
+    driver: local