diff --git a/.github/ci_templates/build.yml b/.github/ci_templates/build.yml
index 0c69a5a974..37b9e6994f 100644
--- a/.github/ci_templates/build.yml
+++ b/.github/ci_templates/build.yml
@@ -1,7 +1,14 @@
 {!{ define "go_generate_template" }!}
 # <template: go_generate_template>
 runs-on: [self-hosted, regular]
+defaults:
+  run:
+    working-directory: ./${{ github.run_id }}
 steps:
+  - name: Create workdir
+    working-directory: .
+    run: mkdir ./${{ github.run_id }}
+
   {!{ tmpl.Exec "started_at_output"            . | strings.Indent 2 }!}
   {!{ tmpl.Exec "checkout_step"                . | strings.Indent 2 }!}
   {!{ tmpl.Exec "login_readonly_registry_step" . | strings.Indent 2 }!}
diff --git a/.github/workflows/build-and-test_dev.yml b/.github/workflows/build-and-test_dev.yml
index 52de77fa7d..d23605f7ce 100644
--- a/.github/workflows/build-and-test_dev.yml
+++ b/.github/workflows/build-and-test_dev.yml
@@ -420,7 +420,14 @@ jobs:
 
     # <template: go_generate_template>
     runs-on: [self-hosted, regular]
+    defaults:
+      run:
+        working-directory: ./${{ github.run_id }}
     steps:
+      - name: Create workdir
+        working-directory: .
+        run: mkdir ./${{ github.run_id }}
+
 
       # <template: started_at_output>
       - name: Job started timestamp
diff --git a/.github/workflows/build-and-test_pre-release.yml b/.github/workflows/build-and-test_pre-release.yml
index 660d045ef4..153125892d 100644
--- a/.github/workflows/build-and-test_pre-release.yml
+++ b/.github/workflows/build-and-test_pre-release.yml
@@ -138,7 +138,14 @@ jobs:
 
     # <template: go_generate_template>
     runs-on: [self-hosted, regular]
+    defaults:
+      run:
+        working-directory: ./${{ github.run_id }}
     steps:
+      - name: Create workdir
+        working-directory: .
+        run: mkdir ./${{ github.run_id }}
+
 
       # <template: started_at_output>
       - name: Job started timestamp
diff --git a/.github/workflows/build-and-test_release.yml b/.github/workflows/build-and-test_release.yml
index 4d8c7d3ba2..630091b31b 100644
--- a/.github/workflows/build-and-test_release.yml
+++ b/.github/workflows/build-and-test_release.yml
@@ -188,7 +188,14 @@ jobs:
 
     # <template: go_generate_template>
     runs-on: [self-hosted, regular]
+    defaults:
+      run:
+        working-directory: ./${{ github.run_id }}
     steps:
+      - name: Create workdir
+        working-directory: .
+        run: mkdir ./${{ github.run_id }}
+
 
       # <template: started_at_output>
       - name: Job started timestamp