diff --git a/tasks/docker/build.yml b/tasks/docker/build.yml
index cba5c38..7d5602c 100644
--- a/tasks/docker/build.yml
+++ b/tasks/docker/build.yml
@@ -1,14 +1,35 @@
 ---
-- name: Clone repositories
-  when: item.value.build is defined
-  git:
-    repo: "{{ item.value.build.repository }}"
-    dest: /tmp/{{ item.key }}
-    version: "{{ item.value.build.version }}"
-    accept_hostkey: true
-  loop: "{{ omni_compose_apps | dict2items }}"
-  loop_control:
-    label: "{{ item.key }}"
+- name: Download source
+  block:
+    - name: Clone repositories
+      when: item.value.build is defined
+      git:
+        repo: "{{ item.value.build.repository }}"
+        dest: /tmp/{{ item.key }}
+        version: "{{ item.value.build.version }}"
+        accept_hostkey: true
+      loop: "{{ omni_compose_apps | dict2items }}"
+      loop_control:
+        label: "{{ item.key }}"
+  rescue:
+    - name: Remove existing repository downloads
+      file:
+        path: /tmp/{{ item.key }}
+        state: absent
+      loop: "{{ omni_compose_apps | dict2items }}"
+      loop_control:
+        label: "{{ item.key }}"
+
+    - name: Clone repositories
+      when: item.value.build is defined
+      git:
+        repo: "{{ item.value.build.repository }}"
+        dest: /tmp/{{ item.key }}
+        version: "{{ item.value.build.version }}"
+        accept_hostkey: true
+      loop: "{{ omni_compose_apps | dict2items }}"
+      loop_control:
+        label: "{{ item.key }}"
 
 - name: Build image
   when: item.value.build is defined