diff --git a/roles/build-images/tasks/main.yml b/roles/build-images/tasks/main.yml
index 923af63..e737319 100644
--- a/roles/build-images/tasks/main.yml
+++ b/roles/build-images/tasks/main.yml
@@ -21,8 +21,10 @@
     tag: "{{ build_docker_tag }}"
     dockerfile: "{{ item.dockerfile }}"
     pull: False
-    force: "{{ item.rebuild | default(False) }}"
+    force: True
+    rm: False
   with_items: "{{ docker_images }}"
+  when: "{{ item.build | default(True) }}"
 
 - name: Build optional images
   docker_image:
@@ -31,7 +33,8 @@
     tag: "{{ build_docker_tag }}"
     dockerfile: "{{ item.dockerfile }}"
     pull: False
-    force: "{{ item.rebuild | default(False) }}"
+    force: True
+    rm: False
   with_items: "{{ docker_optional_images }}"
   when: build_optional_images
 
@@ -42,7 +45,8 @@
     path: "{{ cord_dir }}/{{ item.path }}"
     tag: "{{ build_docker_tag }}"
     pull: False
-    force: "{{ item.rebuild | default(False) }}"
+    force: True
+    rm: False
   with_items: "{{ enabled_gui_extensions }}"
 
 # Build synchronizer images
@@ -53,6 +57,7 @@
     dockerfile: "Dockerfile.synchronizer"
     tag: "{{ build_docker_tag }}"
     pull: False
-    force: "{{ item.rebuild | default(False) }}"
+    force: True
+    rm: False
   with_items: "{{ xos_services }}"
   when: not frontend_only and item.synchronizer is defined and item.synchronizer