diff --git a/.envs/.local/.django b/.envs/.local/.django
deleted file mode 100644
index bcde257a..00000000
--- a/.envs/.local/.django
+++ /dev/null
@@ -1,4 +0,0 @@
-# General
-# ------------------------------------------------------------------------------
-USE_DOCKER=yes
-IPYTHONDIR=/app/.ipython
diff --git a/.gitignore b/.gitignore
index 7d2a0373..5a1f20e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,5 +278,3 @@ project.min.css
 vendors.js
 *.min.js
 .env
-.envs/*
-!.envs/.local/
diff --git a/.envs/.local/.postgres b/env/docker_local.env
similarity index 70%
rename from .envs/.local/.postgres
rename to env/docker_local.env
index f8887ab7..7d955f97 100644
--- a/.envs/.local/.postgres
+++ b/env/docker_local.env
@@ -5,3 +5,8 @@ VBV_POSTGRES_PORT=5432
 VBV_POSTGRES_DB=vbv_lernwelt
 VBV_POSTGRES_USER=MRsLOrFLFqmAnAxxWMsHXfUSqWHThtGQ
 VBV_POSTGRES_PASSWORD=hNqfCdG6bwCLcnfboDtNM1L2Hiwp8GuKp1DJ6t2rcKl15Vls2QbByoIZ6IQlciKM
+
+# General
+# ------------------------------------------------------------------------------
+USE_DOCKER=yes
+IPYTHONDIR=/app/.ipython
diff --git a/env_secrets/production.env b/env_secrets/production.env
new file mode 100644
index 00000000..388376c5
Binary files /dev/null and b/env_secrets/production.env differ
diff --git a/local.yml b/local.yml
index d8a53086..93e1a57c 100644
--- a/local.yml
+++ b/local.yml
@@ -16,8 +16,7 @@ services:
     volumes:
       - .:/app:z
     env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
+      - ./env/docker_local.env
     ports:
       - "8000:8000"
     command: /start
@@ -32,7 +31,7 @@ services:
       - vbv_lernwelt_local_postgres_data:/var/lib/postgresql/data:Z
       - vbv_lernwelt_local_postgres_data_backups:/backups:z
     env_file:
-      - ./.envs/.local/.postgres
+      - ./env/docker_local.env
 
   docs:
     image: vbv_lernwelt_local_docs
@@ -41,7 +40,7 @@ services:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
     env_file:
-      - ./.envs/.local/.django
+      - ./env/docker_local.env
     volumes:
       - ./docs:/docs:z
       - ./config:/app/config:z
diff --git a/production.yml b/production.yml
index 3ff8a94c..f04b1f56 100644
--- a/production.yml
+++ b/production.yml
@@ -15,8 +15,7 @@ services:
       - postgres
       - redis
     env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
+      - env_secrets/production.env
     command: /start
 
   postgres:
@@ -28,7 +27,7 @@ services:
       - production_postgres_data:/var/lib/postgresql/data:Z
       - production_postgres_data_backups:/backups:z
     env_file:
-      - ./.envs/.production/.postgres
+      - env_secrets/production.env
 
   traefik:
     build: