diff --git a/docker-compose.yml b/docker-compose.yml
index fbe16c00..8b6ff04d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       - opaque_database
       - opaque_redis
     env_file:
-      - opaque_database_env
-      - opaque_env
+      - opaque_database.env
+      - opaque.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque:development
     ports:
       - 5000:5000
@@ -19,15 +19,14 @@ services:
     container_name: opaque_daemon
     depends_on:
       - opaque_database
-    env_file:
-      - opaque_database_env
+    env_file: opaque_database.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
     restart: always
     volumes:
       - $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
   opaque_database:
     container_name: opaque_database
-    env_file: opaque_database_env
+    env_file: opaque_database.env
     image: postgres:alpine
     restart: always
     volumes:
diff --git a/opaque.env b/opaque.env
new file mode 100644
index 00000000..6baec6dc
--- /dev/null
+++ b/opaque.env
@@ -0,0 +1,14 @@
+### Flask ###
+FLASK_CONFIG=development
+# SECRET_KEY=
+
+### Flask-Mail ###
+MAIL_SERVER=smtp.gmail.com
+MAIL_PORT=587
+MAIL_USE_TLS=true
+MAIL_USERNAME=dev.opaque@gmail.com
+MAIL_PASSWORD=Opaque-dev1
+MAIL_DEFAULT_SENDER=dev.opaque@gmail.com
+
+### Opaque ###
+OPAQUE_ADMIN=p.jentsch@uni-bielefeld.de
diff --git a/opaque_env.tpl b/opaque.env.tpl
similarity index 100%
rename from opaque_env.tpl
rename to opaque.env.tpl
diff --git a/opaque_database_env.tpl b/opaque_database.env
similarity index 100%
rename from opaque_database_env.tpl
rename to opaque_database.env
diff --git a/opaque_database.env.tpl b/opaque_database.env.tpl
new file mode 100644
index 00000000..5ad5b2b6
--- /dev/null
+++ b/opaque_database.env.tpl
@@ -0,0 +1,3 @@
+POSTGRES_DB_NAME=opaque
+POSTGRES_USER=opaque
+POSTGRES_PASSWORD=opaque