diff --git a/docker-compose.yml b/docker-compose.yml
index b4f4a55..333e73f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,10 +10,8 @@ services:
         logging:
             driver: "none"
 
-        environment:
-            POSTGRES_DB: wiki
-            POSTGRES_USER: wikiuser
-            POSTGRES_PASSWORD: wikipass
+        env_file:
+            - ./.env-wiki_db
 
         volumes:
             - ./etc/db-data:/var/lib/postgresql/data
@@ -26,13 +24,8 @@ services:
         depends_on:
             - wiki_db
 
-        environment:
-            DB_TYPE: postgres
-            DB_HOST: wiki_db
-            DB_PORT: 5432
-            DB_NAME: wiki
-            DB_USER: wikiuser
-            DB_PASS: wikipass
+        env_file:
+            - ./.env-wiki_instance
 
         ports:
             - "3008:3000"