diff --git a/roles/prepare-workspace/tasks/main.yaml b/roles/prepare-workspace/tasks/main.yaml
index 48fc29ac0..1b513fe20 100644
--- a/roles/prepare-workspace/tasks/main.yaml
+++ b/roles/prepare-workspace/tasks/main.yaml
@@ -1,9 +1,10 @@
-# TODO(pabelanger): Handle cleanup on static nodes
 - name: Start zuul_console daemon.
   zuul_console:
 
 - name: Synchronize src repos to workspace directory.
   synchronize:
+    delete: true
     dest: "{{ zuul_workspace_root }}"
+    recursive: true
     src: "{{ zuul.executor.src_root }}"
   no_log: true