diff --git a/templates/magento-1/.env.dev b/templates/magento-1/.env.dev
index c7e9df4..cb43f65 100644
--- a/templates/magento-1/.env.dev
+++ b/templates/magento-1/.env.dev
@@ -4,6 +4,11 @@
 GCLOUD_BUCKET_URL_DB="gs://<BUCKET_NAME>/fixtures/db.sql"
 GCLOUD_BUCKET_URL_MEDIA="gs://<BUCKET_NAME>/fixtures/media.tgz"
 
+################################################################################
+# DNS configuration                                                            #
+################################################################################
+DNS_NAME="https://<SUBDOMAIN>.dev.mediacthq.nl/"
+
 ################################################################################
 # Magento URL configuration                                                    #
 ################################################################################
@@ -15,12 +20,11 @@ CONFIG__DEFAULT__WEB__SECURE__BASE_URL="https://<SUBDOMAIN>.dev.mediacthq.nl/"
 ################################################################################
 
 # Miscellaneous configuration
-COMPOSER_MEMORY_LIMIT=-1
 CLOUDSDK_PYTHON=/usr/bin/python
 GCLOUD_LOCAL="~/.config/gcloud"
-GIT_CONFIG_LOCAL="~/.gitconfig"
-XDEBUG_CONFIG="remote_host=${HOST_IP} remote_enable=1 coverage_enable=1"
-PHP_VERSION=7.3
+XDEBUG_CONFIG="remote_host=${HOST_IP} coverage_enable=0 remote_enable=1 remote_connect_back=1"
+COMPOSER_ALLOW_XDEBUG=0
+PHP_VERSION="7.3"
 
 # Port configuration
 MAILHOG_PORT=8025
@@ -39,3 +43,11 @@ DB_NAME=magento
 REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_PASSWORD=
+
+# PHP-FPM
+PHP_FPM_HOST=php-fpm
+PHP_FPM_PORT=9000
+NGINX_PHP_FPM_HOST=nginx-php-fpm
+NGINX_PHP_FPM_PORT=80
+PROXY_HOST=nginx-php-fpm
+PROXY_PORT=80
diff --git a/templates/magento-1/docker-compose.yml b/templates/magento-1/docker-compose.yml
index 06fdf8e..aee47e7 100644
--- a/templates/magento-1/docker-compose.yml
+++ b/templates/magento-1/docker-compose.yml
@@ -1,11 +1,12 @@
 # vim: ai:ts=2:sw=2:et
 version: "3.4"
-networks: {}
+networks:
+  backend:
 volumes:
   db-data:
 
 x-custom:
-  version: 1.0.2
+  version: 1.0.1
   type: magento-1
   environment: &env-vars
     # Environment settings
@@ -19,10 +20,11 @@ x-custom:
     - DB_PASS
     - DB_NAME
     - MYSQL_PORT
+    - MAGE_RUN_CODE
     # GCP settings
     - CLOUDSDK_CONFIG=/config/mygcloud
     - GCLOUD_BUCKET_URL_DB
-    - GCLOUD_BUCKET_URL_MEDIA
+    # - GCLOUD_BUCKET_URL_MEDIA
 
 services:
   console:
@@ -32,14 +34,16 @@ services:
       - db
       - mailcatch
       - redis
-    network_mode: bridge
+    networks:
+      - backend
     environment: *env-vars
+    extra_hosts:
+      - "${DNS_NAME}:${HOST_IP}"
     working_dir: "${PWD}"
     volumes:
       - "${HOME}:${CHOME}"
       - "${PWD}:${PWD}"
       - "${GCLOUD_LOCAL}:/config/mygcloud"
-      - "${GIT_CONFIG_LOCAL}:/etc/gitconfig:ro"
       - "${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}"
       - /etc/group:/etc/group:ro
       - /etc/passwd:/etc/passwd:ro
@@ -47,55 +51,72 @@ services:
 
   db:
     image: percona:5.7
-    environment:
-      - MYSQL_ROOT_PASSWORD
+    networks:
+      - backend
     ports:
       - "${MYSQL_PORT}:3306"
-    network_mode: bridge
+    environment:
+      - MYSQL_ROOT_PASSWORD
     volumes:
       - db-data:/var/lib/mysql:rw
-      - /etc/group:/etc/group:ro
-      - /etc/passwd:/etc/passwd:ro
-      - /etc/shadow:/etc/shadow:ro
 
   mailcatch:
     image: mailhog/mailhog
-    network_mode: bridge
+    networks:
+      - backend
     ports:
       - "${MAILHOG_PORT}:8025"
 
   redis:
     image: redis:5.0-alpine
-    network_mode: bridge
+    networks:
+      - backend
+
+  nginx-php-fpm:
+    image: eu.gcr.io/mct-deployments/magento-2-nginx-php-fpm
+    networks:
+      - backend
+    links:
+      - php-fpm
+    working_dir: "${PWD}"
+    environment:
+      - "MAGE_ROOT=${PWD}"
+      - PHP_FPM_HOST
+      - PHP_FPM_PORT
+    extra_hosts:
+      - "${DNS_NAME}:${HOST_IP}"
+    volumes:
+      - "${PWD}:${PWD}:ro"
+      - ./nginx-map-dev.conf:/etc/nginx/conf.d/map.conf:ro
+      - ./nginx-dev.conf:/etc/nginx/app.conf:ro
 
-  web:
-    image: eu.gcr.io/mct-deployments/magento-2-nginx
+  nginx-ssl-proxy:
+    image: eu.gcr.io/mct-deployments/mediacthq-dev-nginx-ssl-proxy
+    networks:
+      - backend
     links:
-      - worker
-    network_mode: bridge
+      - nginx-php-fpm
     ports:
       - "${WEB_PORT_HTTP}:80"
       - "${WEB_PORT_HTTPS}:443"
     environment:
-      - PHP_FPM_HOST=worker:9000
+      - PROXY_HOST
+      - PROXY_PORT
     working_dir: "${PWD}"
-    volumes:
-      - "${PWD}:${PWD}:ro"
-      - ./nginx-dev.conf:/etc/nginx/dev.conf:ro
 
-  worker:
+  php-fpm:
     image: "eu.gcr.io/mct-deployments/magento-2-php-fpm:${PHP_VERSION}"
-    user: "${UID}:${GID}"
+    user: "${CUID}:${CGID}"
+    networks:
+      - backend
     links:
       - db
       - mailcatch
       - redis
-    network_mode: bridge
     environment: *env-vars
     working_dir: "${PWD}"
     volumes:
       - "${PWD}:${PWD}:rw"
       - /etc/group:/etc/group:ro
       - /etc/passwd:/etc/passwd:ro
-      - /etc/shadow:/etc/shadow:ro
-
+      - /etc/shadow:/etc/shadow:ro
\ No newline at end of file
diff --git a/templates/magento-1/nginx-dev.conf b/templates/magento-1/nginx-dev.conf
index f1c0b02..f4acc45 100644
--- a/templates/magento-1/nginx-dev.conf
+++ b/templates/magento-1/nginx-dev.conf
@@ -46,5 +46,6 @@ location ~* \.php$ {
 
     fastcgi_index  index.php;
     fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    fastcgi_param  MAGE_RUN_CODE $MAGE_RUN_CODE;
     include        fastcgi_params;
 }
diff --git a/templates/magento-1/nginx-map-dev.conf b/templates/magento-1/nginx-map-dev.conf
new file mode 100644
index 0000000..3f6df23
--- /dev/null
+++ b/templates/magento-1/nginx-map-dev.conf
@@ -0,0 +1,5 @@
+map $http_host $MAGE_RUN_CODE {
+    default '';
+    french.dev.mediacthq.nl french;
+    german.dev.mediacthq.nl german;
+}
diff --git a/templates/magento-1/var/log/.gitkeep b/templates/magento-1/var/log/.gitkeep
deleted file mode 100644
index e69de29..0000000