diff --git a/.env b/.env
new file mode 100644
index 0000000..394df2f
--- /dev/null
+++ b/.env
@@ -0,0 +1,5 @@
+SECRET_KEY=TEST---asdg4hr63453452542h4sdf25g42s3df54hj38rd4sg3f2d54h3sd5f4g53
+DEBUG=False
+SENTRY_DSN=https://460e310d034c49a794941e087c4fcc6e@sentry.io/1196285
+DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/index-*
+DATABASE_URL=postgres://django:MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX@postgres:5432/db
\ No newline at end of file
diff --git a/.env-db b/.env-db
new file mode 100644
index 0000000..f221b30
--- /dev/null
+++ b/.env-db
@@ -0,0 +1,3 @@
+POSTGRES_USER=django
+POSTGRES_PASSWORD=MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX
+POSTGRES_DB=db
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 547bede..7c4695e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ Thumbs.db
 *.pyo
 
 # Aldryn
-/.env
 .aldryn
 /data
 /data.tar.gz
diff --git a/Dockerfile b/Dockerfile
index 47e42af..6a2024f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,8 +57,6 @@ COPY . /app
 RUN mkdir /app/static_collected
 RUN mkdir /app/data/media
 
-# TODO: Postgres Database Username / Password
-
 # <GULP>
 ENV GULP_MODE=production
 RUN gulp build
diff --git a/docker-compose.yml b/docker-compose.yml
index 43d8bef..a14bc52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,16 +40,12 @@ services:
       - nginx_network
       - db_network
     command: "/bin/sh -c '/app/wait-for-postgres.sh postgres /app/run.sh'"
-    environment:
-      SECRET_KEY: "TEST---asdg4hr63453452542h4sdf25g42s3df54hj38rd4sg3f2d54h3sd5f4g53"
-      DEBUG: "False"
-      SENTRY_DSN: "https://460e310d034c49a794941e087c4fcc6e@sentry.io/1196285"
-      DEFAULT_HAYSTACK_URL: "es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/index-*"
-      DATABASE_URL: "postgres://postgres@postgres:5432/db"
+    env_file:
+      - ./.env
   db:
     image: postgres:9.6-alpine
-    environment:
-      POSTGRES_DB: "db"
+    env_file:
+      - ./.env-db
     volumes:
       - ".:/app:rw"
       - "./pgdata:/var/lib/postgresql/data:rw"