diff --git a/Dockerfile b/Dockerfile
index 09f932e..d96e7e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,8 @@
 FROM alpine:edge
 MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>
 
-ENV WALLABAG_VERSION=2.1.1 \
-    SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite \
-    SYMFONY__ENV__DATABASE_HOST=127.0.0.1 \
-    SYMFONY__ENV__DATABASE_PORT=~ \
-    SYMFONY__ENV__DATABASE_NAME=symfony \
-    SYMFONY__ENV__DATABASE_USER=root \
-    SYMFONY__ENV__DATABASE_PASSWORD=~ \
-    POSTGRES_USER=postgres \
-    SYMFONY__ENV__SECRET=ovmpmAWXRCabNlMgzlzFXDYmCFfzGv \
-    SYMFONY__ENV__MAILER_HOST=127.0.0.1 \
-    SYMFONY__ENV__MAILER_USER=~ \
-    SYMFONY__ENV__MAILER_PASSWORD=~ \
-    SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
-
+ENV WALLABAG_VERSION=2.1.2 \
+    POSTGRES_USER=postgres
 
 RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --update \
diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml
index bec63f1..e150425 100644
--- a/root/etc/ansible/entrypoint.yml
+++ b/root/etc/ansible/entrypoint.yml
@@ -13,6 +13,7 @@
     database_root_user_postgres: "{{ lookup('env', 'POSTGRES_USER') }}"
     database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}"
     database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER') }}"
+    secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}"
 
   tasks:
 
diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2
index 964d43e..bf16e32 100644
--- a/root/etc/ansible/templates/parameters.yml.j2
+++ b/root/etc/ansible/templates/parameters.yml.j2
@@ -7,6 +7,7 @@ parameters:
     database_password: {{ database_password }}
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
+    database_socket: null
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -16,7 +17,7 @@ parameters:
     locale:            en
 
     # A secret key that's used to generate certain security-related tokens
-    secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
+    secret: {{ secret }}
 
     # two factor stuff
     twofactor_auth: true
@@ -37,5 +38,7 @@ parameters:
     rabbitmq_password: guest
 
     # Redis processing
+    redis_scheme: tcp
     redis_host: redis
     redis_port: 6379
+    redis_path: null
diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml
index 9138d46..07864d9 100644
--- a/root/var/www/wallabag/app/config/parameters.yml
+++ b/root/var/www/wallabag/app/config/parameters.yml
@@ -1,12 +1,13 @@
 parameters:
-    database_driver: %env.database_driver%
-    database_host: %env.database_host%
-    database_port: %env.database_port%
-    database_name: %env.database_name%
-    database_user: %env.database_user%
-    database_password: %env.database_password%
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
+    database_socket: null
 
     test_database_driver: pdo_sqlite
     test_database_host: 127.0.0.1
@@ -45,5 +46,7 @@ parameters:
     rabbitmq_password: guest
 
     # Redis processing
+    redis_scheme: tcp
     redis_host: localhost
     redis_port: 6379
+    redis_path: null