diff --git a/docker-compose.yml b/docker-compose.yml
index 449ab17..3809277 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@
     - postgres
     - redis
     - netbox-worker
-    env_file: netbox.env
+    env_file: env/netbox.env
     volumes:
     - ./startup_scripts:/opt/netbox/startup_scripts:ro
     - ./initializers:/opt/netbox/initializers:ro
@@ -40,7 +40,7 @@
     - netbox-nginx-config:/etc/netbox-nginx/:ro
   postgres:
     image: postgres:10.4-alpine
-    env_file: postgres.env
+    env_file: env/postgres.env
     volumes:
     - netbox-postgres-data:/var/lib/postgresql/data
   redis:
@@ -49,7 +49,7 @@
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: redis.env
+    env_file: env/redis.env
     volumes:
     - netbox-redis-data:/data
 volumes:
diff --git a/env/netbox.env b/env/netbox.env
new file mode 100644
index 0000000..f44c328
--- /dev/null
+++ b/env/netbox.env
@@ -0,0 +1,23 @@
+DB_NAME=netbox
+DB_USER=netbox
+DB_PASSWORD=J5brHrAXFLQSif0K
+DB_HOST=postgres
+EMAIL_SERVER=localhost
+EMAIL_PORT=25
+EMAIL_USERNAME=netbox
+EMAIL_PASSWORD=
+EMAIL_TIMEOUT=5
+EMAIL_FROM=netbox@bar.com
+MEDIA_ROOT=/opt/netbox/netbox/media
+NAPALM_USERNAME=
+NAPALM_PASSWORD=
+NAPALM_TIMEOUT=10
+MAX_PAGE_SIZE=0
+REDIS_HOST=redis
+REDIS_PASSWORD=H733Kdjndks81
+SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
+SUPERUSER_NAME=admin
+SUPERUSER_EMAIL=admin@example.com
+SUPERUSER_PASSWORD=admin
+SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567
+WEBHOOKS_ENABLED=true
diff --git a/env/postgres.env b/env/postgres.env
new file mode 100644
index 0000000..8bc8d28
--- /dev/null
+++ b/env/postgres.env
@@ -0,0 +1,3 @@
+POSTGRES_USER=netbox
+POSTGRES_PASSWORD=J5brHrAXFLQSif0K
+POSTGRES_DB=netbox
diff --git a/env/redis.env b/env/redis.env
new file mode 100644
index 0000000..44a1987
--- /dev/null
+++ b/env/redis.env
@@ -0,0 +1 @@
+REDIS_PASSWORD=H733Kdjndks81
diff --git a/netbox.env b/netbox.env
deleted file mode 100644
index f44c328..0000000
--- a/netbox.env
+++ /dev/null
@@ -1,23 +0,0 @@
-DB_NAME=netbox
-DB_USER=netbox
-DB_PASSWORD=J5brHrAXFLQSif0K
-DB_HOST=postgres
-EMAIL_SERVER=localhost
-EMAIL_PORT=25
-EMAIL_USERNAME=netbox
-EMAIL_PASSWORD=
-EMAIL_TIMEOUT=5
-EMAIL_FROM=netbox@bar.com
-MEDIA_ROOT=/opt/netbox/netbox/media
-NAPALM_USERNAME=
-NAPALM_PASSWORD=
-NAPALM_TIMEOUT=10
-MAX_PAGE_SIZE=0
-REDIS_HOST=redis
-REDIS_PASSWORD=H733Kdjndks81
-SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
-SUPERUSER_NAME=admin
-SUPERUSER_EMAIL=admin@example.com
-SUPERUSER_PASSWORD=admin
-SUPERUSER_API_TOKEN=0123456789abcdef0123456789abcdef01234567
-WEBHOOKS_ENABLED=true
diff --git a/postgres.env b/postgres.env
deleted file mode 100644
index 8bc8d28..0000000
--- a/postgres.env
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_USER=netbox
-POSTGRES_PASSWORD=J5brHrAXFLQSif0K
-POSTGRES_DB=netbox
diff --git a/redis.env b/redis.env
deleted file mode 100644
index 44a1987..0000000
--- a/redis.env
+++ /dev/null
@@ -1 +0,0 @@
-REDIS_PASSWORD=H733Kdjndks81