diff --git a/roles/build/tasks/centos.yml b/roles/build/tasks/centos.yml
index 62a8fb1fbd84dce5a27660a24f9eab54b59d9b97..2bbb7635c6b9f946196af54195ff558329a01475 100644
--- a/roles/build/tasks/centos.yml
+++ b/roles/build/tasks/centos.yml
@@ -1,15 +1,5 @@
 ---
 
-- name: Check for CentOS image
-  docker_image_info:
-    name: "{{repo}}/centos:{{version}}{{suffix}}"
-  register: centosimg
-
-- name: Assert CentOS image
-  assert:
-    that: centosimg.images | length == 0
-    fail_msg: "CentOS image already exists"
-
 - name: Create etc tree in build directory
   file:
     path: '{{ temp_root}}/{{ item.path }}'
diff --git a/roles/build/tasks/main.yml b/roles/build/tasks/main.yml
index 6dd4e6c892787e04bac92c62284a48b2294df9cf..14bd779a9049f179cfede9ad748d45d967f2629e 100644
--- a/roles/build/tasks/main.yml
+++ b/roles/build/tasks/main.yml
@@ -5,7 +5,17 @@
       - "'CHANGE_ME' not in soctoolsproxy"
     fail_msg: "Review *all* settings in group_vars/all/main.yml"
 
-- include: centos.yml
+
+# Create CentOS image if not created yet
+- name: Check for CentOS image
+  docker_image_info:
+    name: "{{repo}}/centos:{{version}}{{suffix}}"
+  register: centosimg
+
+- name: Include tasks to create CentOS image
+  include_tasks: centos.yml
+  when: centosimg.images | length == 0
+
 
 - name: Create main build dir
   file: