diff --git a/Dockerfile b/Dockerfile
index 7001773..3d8aa26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7-fpm-alpine
+FROM php:7-fpm-alpine3.7
 
 LABEL MAINTAINER diego@passbolt.com
 
@@ -7,7 +7,6 @@ ENV PASSBOLT_URL https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VE
 
 ARG PHP_EXTENSIONS="gd \
       intl \
-      mcrypt \
       xsl"
 
 ARG PHP_GNUPG_BUILD_DEPS="php7-dev \
@@ -20,31 +19,37 @@ ARG PHP_GNUPG_BUILD_DEPS="php7-dev \
       gpgme-dev \
       autoconf \
       zlib-dev \
+      libmcrypt-dev \
       file"
 
-RUN apk add --no-cache $PHP_EXTENSIONS \
-      $PHP_GNUPG_BUILD_DEPS \
+RUN apk add --no-cache $PHP_GNUPG_BUILD_DEPS \
       sed \
+      bash \
       nginx \
       gpgme \
       gnupg1 \
-      mysql-client
-
-RUN apk add --no-cache $PHP_GNUPG_DEPS \
-    && pecl install gnupg \
-    && echo "extension=gnupg.so" > /etc/php7/conf.d/gnupg.ini \
-    && apk del $PHP_GNUPG_DEPS \
+      mysql-client \
+      libpng-dev \
+      icu-dev \
+      libxslt-dev \
+      libmcrypt-dev \
+      supervisor \
+    && pecl install gnupg redis mcrypt-snapshot \
+    && docker-php-ext-install -j4 $PHP_EXTENSIONS \
+    && docker-php-ext-enable $PHP_EXTENSIONS gnupg redis mcrypt \
+    && apk del $PHP_GNUPG_BUILD_DEPS \
     && curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/composer
 
 RUN mkdir /var/www/passbolt \
     && curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \
     && chown -R nginx:nginx /var/www/passbolt \
-    && chmod -R a-w /var/www/passbolt \
-    && chmod -R +w /var/www/passbolt/app/tmp \
-    && chmod -R +w /var/www/passbolt/app/webroot/img/public
+    && chmod -R o-w /var/www/passbolt \
+    && chmod -R +w /var/www/passbolt/tmp \
+    && chmod -R +w /var/www/passbolt/webroot/img/public
 
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
+COPY conf/supervisord.conf /etc/supervisord.conf
 COPY bin/docker-entrypoint.sh /docker-entrypoint.sh
 
 EXPOSE 80 443