diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index c2b7508..978de00 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -14,10 +14,8 @@ services:
         - test
     postgres:
         image: postgres:9.6-alpine
-        environment:
-            POSTGRES_USER: netbox
-            POSTGRES_PASSWORD: J5brHrAXFLQSif0K
-            POSTGRES_DB: netbox
+        env_file: postgres.env
+
 volumes:
     netbox-static-files:
         driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 93edfbc..117925f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,10 +24,8 @@ services:
         - netbox-nginx-config:/etc/netbox-nginx/
     postgres:
         image: postgres:9.6-alpine
-        environment:
-            POSTGRES_USER: netbox
-            POSTGRES_PASSWORD: J5brHrAXFLQSif0K
-            POSTGRES_DB: netbox
+        env_file: postgres.env
+
 volumes:
     netbox-static-files:
         driver: local
diff --git a/postgres.env b/postgres.env
new file mode 100644
index 0000000..8bc8d28
--- /dev/null
+++ b/postgres.env
@@ -0,0 +1,3 @@
+POSTGRES_USER=netbox
+POSTGRES_PASSWORD=J5brHrAXFLQSif0K
+POSTGRES_DB=netbox