diff --git a/Makefile b/Makefile
index 7d16c26..0c30c32 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ setup:
 
 rebuild:
 	docker-compose pull
-	docker-compose build web --no-cache
+	docker-compose build web
 	docker-compose stop web
 	docker-compose kill web
 	docker-compose up -d web
diff --git a/ansible/roles/wagtail/tasks/frontend.yaml b/ansible/roles/wagtail/tasks/frontend.yaml
index 771180c..17dbb2c 100644
--- a/ansible/roles/wagtail/tasks/frontend.yaml
+++ b/ansible/roles/wagtail/tasks/frontend.yaml
@@ -1,5 +1,9 @@
 ---
 
+- name: Create release directory
+  file: path={{ release_dir }} state=directory owner=ansible group=ansible
+  become: true
+
 - name: Install JavaScript Yarn
   become: true
   npm:
@@ -30,11 +34,17 @@
   yarn:
     path: "{{ release_dir }}"
 
-- name: Link the old bower component to libs
+- name: Create libs directory
   file:
-    src: "{{ release_dir }}/node_modules/@bower_components"
-    dest: "{{ release_dir }}/publichealth/static/libs"
-    state: link
+    path: "{{ release_dir }}/publichealth/static/libs/"
+    state: directory
+
+- name: Copy bower components to libs
+  copy:
+    src: "{{ release_dir }}/node_modules/@bower_components/"
+    dest: "{{ release_dir }}/publichealth/static/libs/"
+    remote_src: yes
+    force: yes
 
 - name: Compile JavaScript sources with Grunt
   shell: grunt
diff --git a/ansible/roles/wagtail/tasks/main.yaml b/ansible/roles/wagtail/tasks/main.yaml
index 60712f2..2275ffc 100644
--- a/ansible/roles/wagtail/tasks/main.yaml
+++ b/ansible/roles/wagtail/tasks/main.yaml
@@ -1,13 +1,13 @@
 ---
 
-- include: install.yaml
-  tags:
-    - install
-
 - include: frontend.yaml
   tags:
     - frontend
 
+- include: install.yaml
+  tags:
+    - install
+
 - include: release.yaml
   tags:
     - release