diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7f2cd31..377fc17 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,31 +9,31 @@ services:
       - redis
       - datapusher
     environment:
-      PGHOST: postgres
-      PGPORT: 5432
-      PGUSER: ckan_default
-      PGPASSWORD: pass
-      PGDATABASE: ckan_test
+      PGHOST: ${PGHOST}
+      PGPORT: ${PGPORT}
+      PGUSER: ${PGUSER}
+      PGPASSWORD: ${PGPASSWORD}
+      PGDATABASE: ${PGDATABASE}
 
-      CKAN_POSTGRES_DB: ckan_test
-      CKAN_DATASTORE_POSTGRES_DB: datastore_test
-      CKAN_POSTGRES_USER: ckan_default
-      CKAN_DATASTORE_POSTGRES_READ_USER: ckan_default
-      CKAN_DATASTORE_POSTGRES_WRITE_USER: ckan_default
-      CKAN_POSTGRES_PWD: pass
-      CKAN_DATASTORE_POSTGRES_READ_PWD: pass
-      CKAN_DATASTORE_POSTGRES_WRITE_PWD: pass
+      CKAN_POSTGRES_DB: ${CKAN_POSTGRES_DB}
+      CKAN_DATASTORE_POSTGRES_DB: ${CKAN_DATASTORE_POSTGRES_DB}
+      CKAN_POSTGRES_USER: ${CKAN_POSTGRES_USER}
+      CKAN_DATASTORE_POSTGRES_READ_USER: ${CKAN_DATASTORE_POSTGRES_READ_USER}
+      CKAN_DATASTORE_POSTGRES_WRITE_USER: ${CKAN_DATASTORE_POSTGRES_WRITE_USER}
+      CKAN_POSTGRES_PWD: ${CKAN_POSTGRES_PWD}
+      CKAN_DATASTORE_POSTGRES_READ_PWD: ${CKAN_DATASTORE_POSTGRES_READ_PWD}
+      CKAN_DATASTORE_POSTGRES_WRITE_PWD: ${CKAN_DATASTORE_POSTGRES_WRITE_PWD}
 
-      CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
-      CKAN_DATASTORE_WRITE_URL: postgresql://ckan_default:pass@postgres/datastore_test
-      CKAN_DATASTORE_READ_URL: postgresql://ckan_default:pass@postgres/datastore_test
-      CKAN_SOLR_URL: http://solr:8983/solr/ckan_registry
-      CKAN_REDIS_URL: redis://redis:6379/1
+      CKAN_SQLALCHEMY_URL: ${CKAN_SQLALCHEMY_URL}
+      CKAN_DATASTORE_WRITE_URL: ${CKAN_DATASTORE_WRITE_URL}
+      CKAN_DATASTORE_READ_URL: ${CKAN_DATASTORE_READ_URL}
+      CKAN_SOLR_URL: ${CKAN_SOLR_URL}
+      CKAN_REDIS_URL: ${CKAN_REDIS_URL}
 
-      CKAN_SITE_URL: http://localhost:5001
+      CKAN_SITE_URL: ${CKAN_SITE_URL}
 
     ports:
-      - "5001:5000"
+      - "${CKAN_SITE_URL}:5000"
     volumes:
       ["./service.yaml:/srv/app/src/ckanext-canada/ckanext/canada/tables/service.yaml"]
 
@@ -46,9 +46,9 @@ services:
     container_name: postgres
     image: postgres:14
     environment:
-      POSTGRES_USER: ckan_default
-      POSTGRES_PASSWORD: pass
-      POSTGRES_DB: ckan_test
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
     ports:
       - "5432:5432"
     volumes: