diff --git a/deployer/group_vars/all/vars.yml b/deployer/group_vars/all/vars.yml
index 45799ef..94e3040 100644
--- a/deployer/group_vars/all/vars.yml
+++ b/deployer/group_vars/all/vars.yml
@@ -19,7 +19,7 @@ gitea:
 synapse:
   version: v1.21.2
 drupal: 
-  version: 8.8.5-apache
+  version: 8.9.7-apache
 nextcloud:
   version: 19.0.3
   checksum: md5:2094204fd0c3471be2ec010a71231da6
diff --git a/deployer/roles/build/tasks/drupal.yml b/deployer/roles/build/tasks/drupal.yml
index be99eb3..47eaa0c 100644
--- a/deployer/roles/build/tasks/drupal.yml
+++ b/deployer/roles/build/tasks/drupal.yml
@@ -11,31 +11,35 @@
     # Render templates #
     ####################
 
-    - name: "Create folder {{ sites_path }}/{{ site.slug }}"
-      file: 
-        path: "{{ sites_path }}/{{ site.slug }}"
-        state: directory
-        mode: '750'
-      tags: [docker, nginx, mysql]
+    - name: "Render templates"
+      import_tasks: render.yml
+      tags: render
 
-    - name: Render sexy Dockerfile
-      template: 
-        src: drupal/Dockerfile.j2
-        dest: "{{ sites_path }}/{{ site.slug }}/Dockerfile"
-      tags: docker
+    # - name: "Create folder {{ sites_path }}/{{ site.slug }}"
+    #   file: 
+    #     path: "{{ sites_path }}/{{ site.slug }}"
+    #     state: directory
+    #     mode: '750'
+    #   tags: [docker, nginx, mysql]
 
-    - name: Render marvelous docker-compose.yml
-      template:
-        src: drupal/docker-compose.yml.j2
-        dest: "{{ sites_path }}/{{ site.slug }}/docker-compose.yml"
-      tags: docker
+    # - name: Render sexy Dockerfile
+    #   template: 
+    #     src: drupal/Dockerfile.j2
+    #     dest: "{{ sites_path }}/{{ site.slug }}/Dockerfile"
+    #   tags: docker
 
-    - name: Render swell nginx site config
-      template:
-        src: drupal/nginx.j2
-        dest: "/etc/nginx/sites-available/{{ site.url }}"
-      become: yes
-      tags: nginx
+    # - name: Render marvelous docker-compose.yml
+    #   template:
+    #     src: drupal/docker-compose.yml.j2
+    #     dest: "{{ sites_path }}/{{ site.slug }}/docker-compose.yml"
+    #   tags: docker
+
+    # - name: Render swell nginx site config
+    #   template:
+    #     src: drupal/nginx.j2
+    #     dest: "/etc/nginx/sites-available/{{ site.url }}"
+    #   become: yes
+    #   tags: nginx
 
 
     #######################
diff --git a/deployer/roles/build/tasks/synapse.yml b/deployer/roles/build/tasks/synapse.yml
index a2431b6..351da53 100644
--- a/deployer/roles/build/tasks/synapse.yml
+++ b/deployer/roles/build/tasks/synapse.yml
@@ -3,6 +3,7 @@
 
     - name: "Set site_data_path to {{ www_path }}/{{ site.slug }}"
       set_fact: site_data_path="{{ www_path }}/{{ site.slug }}"
+      tags: always
 
     ####################
     # Render templates #
diff --git a/deployer/roles/build/templates/drupal/docker-compose.yml.j2 b/deployer/roles/build/templates/drupal/docker-compose.yml.j2
index 0a76892..6ff4504 100644
--- a/deployer/roles/build/templates/drupal/docker-compose.yml.j2
+++ b/deployer/roles/build/templates/drupal/docker-compose.yml.j2
@@ -15,6 +15,7 @@ services:
       # We want a host volume for the themes directory to easily work on theming
       - "{{ www_path }}/{{ site.slug }}/themes:/var/www/html/themes"
       - "{{ www_path }}/{{ site.slug }}/sites:/var/www/html/sites"
+      - "{{ www_path }}/{{ site.slug }}/modules:/var/www/html/modules"
     # Fix the container's IP
     networks:
       net:
diff --git a/deployer/roles/build/templates/drupal/nginx.j2 b/deployer/roles/build/templates/drupal/nginx.host.j2
similarity index 100%
rename from deployer/roles/build/templates/drupal/nginx.j2
rename to deployer/roles/build/templates/drupal/nginx.host.j2