diff --git a/compose.code.yaml b/compose.code.yaml
index 6b87332..5b8b351 100644
--- a/compose.code.yaml
+++ b/compose.code.yaml
@@ -1,4 +1,6 @@
 x-dagster-env: &dagster_env
+  DAGSTER_POSTGRES_HOST: ${POSTGRES_HOST}
+  DAGSTER_POSTGRES_PORT: ${POSTGRES_PORT}
   DAGSTER_POSTGRES_USER: ${POSTGRES_USER}
   DAGSTER_POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   DAGSTER_POSTGRES_DB: ${POSTGRES_DB}
diff --git a/compose.system.yaml b/compose.system.yaml
index a2a48c0..c35f50f 100644
--- a/compose.system.yaml
+++ b/compose.system.yaml
@@ -1,4 +1,6 @@
 x-postgres-env: &postgres_env
+  DAGSTER_POSTGRES_HOST: ${POSTGRES_HOST}
+  DAGSTER_POSTGRES_PORT: ${POSTGRES_PORT}
   POSTGRES_USER: ${POSTGRES_USER}
   POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
   POSTGRES_DB: ${POSTGRES_DB}
diff --git a/dagster.yaml b/dagster.yaml
index 1e90aac..4b16a7c 100644
--- a/dagster.yaml
+++ b/dagster.yaml
@@ -14,6 +14,8 @@ run_launcher:
   class: DockerRunLauncher
   config:
     env_vars:
+      - DAGSTER_POSTGRES_HOST
+      - DAGSTER_POSTGRES_PORT
       - DAGSTER_POSTGRES_USER
       - DAGSTER_POSTGRES_PASSWORD
       - DAGSTER_POSTGRES_DB
@@ -33,39 +35,45 @@ run_storage:
   class: PostgresRunStorage
   config:
     postgres_db:
-      hostname: postgresql
+      hostname:
+        env: DAGSTER_POSTGRES_HOST
+      port:
+        env: DAGSTER_POSTGRES_PORT
       username:
         env: DAGSTER_POSTGRES_USER
       password:
         env: DAGSTER_POSTGRES_PASSWORD
       db_name:
         env: DAGSTER_POSTGRES_DB
-      port: 5432
 
 schedule_storage:
   module: dagster_postgres.schedule_storage
   class: PostgresScheduleStorage
   config:
     postgres_db:
-      hostname: postgresql
+      hostname:
+        env: DAGSTER_POSTGRES_HOST
+      port:
+        env: DAGSTER_POSTGRES_PORT
       username:
         env: DAGSTER_POSTGRES_USER
       password:
         env: DAGSTER_POSTGRES_PASSWORD
       db_name:
         env: DAGSTER_POSTGRES_DB
-      port: 5432
 
 event_log_storage:
   module: dagster_postgres.event_log
   class: PostgresEventLogStorage
   config:
     postgres_db:
-      hostname: postgresql
+      hostname:
+        env: DAGSTER_POSTGRES_HOST
+      port:
+        env: DAGSTER_POSTGRES_PORT
       username:
         env: DAGSTER_POSTGRES_USER
       password:
         env: DAGSTER_POSTGRES_PASSWORD
       db_name:
         env: DAGSTER_POSTGRES_DB
-      port: 5432