diff --git a/galaxy.yml b/galaxy.yml
index 2af82ee..731fb13 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: stackhpc
 name: openstack
-version: 0.9.0
+version: 0.9.1
 readme: README.md
 authors:
   - StackHPC Ltd
diff --git a/roles/os_images/tasks/prechecks.yml b/roles/os_images/tasks/prechecks.yml
index 11a654e..e3a008c 100644
--- a/roles/os_images/tasks/prechecks.yml
+++ b/roles/os_images/tasks/prechecks.yml
@@ -6,6 +6,9 @@
   changed_when: false
   ignore_errors: true
   register: result
+  when:
+    - os_images_build | bool
+    - os_images_list | selectattr('elements', 'defined') | list | length > 0
 
 - name: Display warning message about the container engine
   ansible.builtin.assert:
@@ -14,3 +17,6 @@
     fail_msg: >
       Container runtime engine could not be found - make sure it is installed.
       Elements that depend on it will likely fail when building.
+  when:
+    - os_images_build | bool
+    - os_images_list | selectattr('elements', 'defined') | list | length > 0
diff --git a/roles/os_images/tasks/prereqs.yml b/roles/os_images/tasks/prereqs.yml
index 77de1d7..c4cd8b4 100644
--- a/roles/os_images/tasks/prereqs.yml
+++ b/roles/os_images/tasks/prereqs.yml
@@ -55,7 +55,10 @@
   # Using --reset means that we always change something
   changed_when: true
   become: true
-  when: os_images_list |
-        selectattr("architecture", "defined") |
-        rejectattr("architecture", "equalto", ansible_facts.architecture) |
-        length > 0
+  when:
+    - os_images_build | bool
+    - os_images_list |
+      selectattr("elements", "defined") |
+      selectattr("architecture", "defined") |
+      rejectattr("architecture", "equalto", ansible_facts.architecture) |
+      list | length > 0