diff --git a/roles/prepare-workspace-git/tasks/main.yaml b/roles/prepare-workspace-git/tasks/main.yaml
index 8c4b18c5c..726cf4727 100644
--- a/roles/prepare-workspace-git/tasks/main.yaml
+++ b/roles/prepare-workspace-git/tasks/main.yaml
@@ -30,15 +30,15 @@
           git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
       fi
       cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
-      git config --local --bool core.bare false
-      git remote -v | grep origin && git remote rm origin || true
-      git remote add origin file:///dev/null
     fi
     cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
+    git config --local --bool core.bare false
     # Allow pushing to non-bare repo
     git config --local receive.denyCurrentBranch ignore
     # Allow deleting current branch
     git config --local receive.denyDeleteCurrent ignore
+    git remote -v | grep origin && git remote rm origin || true
+    git remote add origin file:///dev/null
   with_items: "{{ _zuul_projects.values() }}"
   loop_control:
     loop_var: zj_project
diff --git a/roles/test-prepare-workspace-git/tasks/main.yaml b/roles/test-prepare-workspace-git/tasks/main.yaml
index 8c4b18c5c..726cf4727 100644
--- a/roles/test-prepare-workspace-git/tasks/main.yaml
+++ b/roles/test-prepare-workspace-git/tasks/main.yaml
@@ -30,15 +30,15 @@
           git init {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
       fi
       cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
-      git config --local --bool core.bare false
-      git remote -v | grep origin && git remote rm origin || true
-      git remote add origin file:///dev/null
     fi
     cd {{ zuul_workspace_root }}/{{ zj_project.src_dir }}
+    git config --local --bool core.bare false
     # Allow pushing to non-bare repo
     git config --local receive.denyCurrentBranch ignore
     # Allow deleting current branch
     git config --local receive.denyDeleteCurrent ignore
+    git remote -v | grep origin && git remote rm origin || true
+    git remote add origin file:///dev/null
   with_items: "{{ _zuul_projects.values() }}"
   loop_control:
     loop_var: zj_project