diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 8db4b250..bb00a3cf 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -1974,6 +1974,15 @@ jobs:
             echo "::error::Tai Docker gRPC failed"; docker logs tai-docker 2>&1; exit 1
           }
 
+      - name: Generate kubeconfig for benchmarks
+        run: |
+          K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
+          k3d kubeconfig get tai-test > /tmp/kubeconfig-k3d-bench.yml
+          sed "s|server: .*|server: https://${K3D_IP}:6443|" /tmp/kubeconfig-k3d-bench.yml \
+            > /tmp/kubeconfig-tai-k8s-bench.yml
+          sed 's|server: .*|server: https://127.0.0.1:6443|' /tmp/kubeconfig-k3d-bench.yml \
+            > ${{ runner.temp }}/kubeconfig-tai.yml
+
       - name: Start Tai K8s instance (benchmarks)
         run: |
           K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
@@ -1983,7 +1992,7 @@ jobs:
             --network k3d-tai-test \
             -p 8081:8080 -p 9101:9100 -p 6443:6443 -p 6081:6080 \
             -v /var/run/docker.sock:/var/run/docker.sock:ro \
-            -v /tmp/kubeconfig-tai-k8s.yml:/etc/tai/kubeconfig.yml:ro \
+            -v /tmp/kubeconfig-tai-k8s-bench.yml:/etc/tai/kubeconfig.yml:ro \
             -e TAI_K8S_UPSTREAM="tcp://${K3D_IP}:6443" \
             -e TAI_KUBECONFIG=/etc/tai/kubeconfig.yml \
             yaoapp/tai:latest
@@ -2008,15 +2017,6 @@ jobs:
             echo "::error::Tai K8s gRPC failed"; docker logs tai-k8s 2>&1; exit 1
           }
 
-      - name: Generate kubeconfig for benchmarks
-        run: |
-          K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
-          k3d kubeconfig get tai-test > /tmp/kubeconfig-k3d.yml
-          sed "s|server: .*|server: https://${K3D_IP}:6443|" /tmp/kubeconfig-k3d.yml \
-            > /tmp/kubeconfig-tai-k8s.yml
-          sed 's|server: .*|server: https://127.0.0.1:6443|' /tmp/kubeconfig-k3d.yml \
-            > ${{ runner.temp }}/kubeconfig-tai.yml
-
       - name: Run Benchmarks
         env:
           TAI_TEST_HOST: "127.0.0.1"
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 31920fc1..99b8829d 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -1480,6 +1480,15 @@ jobs:
             echo "::error::Tai Docker gRPC failed"; docker logs tai-docker 2>&1; exit 1
           }
 
+      - name: Generate kubeconfig for benchmarks
+        run: |
+          K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
+          k3d kubeconfig get tai-test > /tmp/kubeconfig-k3d-bench.yml
+          sed "s|server: .*|server: https://${K3D_IP}:6443|" /tmp/kubeconfig-k3d-bench.yml \
+            > /tmp/kubeconfig-tai-k8s-bench.yml
+          sed 's|server: .*|server: https://127.0.0.1:6443|' /tmp/kubeconfig-k3d-bench.yml \
+            > ${{ runner.temp }}/kubeconfig-tai.yml
+
       - name: Start Tai K8s instance (benchmarks)
         run: |
           K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
@@ -1489,7 +1498,7 @@ jobs:
             --network k3d-tai-test \
             -p 8081:8080 -p 9101:9100 -p 6443:6443 -p 6081:6080 \
             -v /var/run/docker.sock:/var/run/docker.sock:ro \
-            -v /tmp/kubeconfig-tai-k8s.yml:/etc/tai/kubeconfig.yml:ro \
+            -v /tmp/kubeconfig-tai-k8s-bench.yml:/etc/tai/kubeconfig.yml:ro \
             -e TAI_K8S_UPSTREAM="tcp://${K3D_IP}:6443" \
             -e TAI_KUBECONFIG=/etc/tai/kubeconfig.yml \
             yaoapp/tai:latest
@@ -1514,15 +1523,6 @@ jobs:
             echo "::error::Tai K8s gRPC failed"; docker logs tai-k8s 2>&1; exit 1
           }
 
-      - name: Generate kubeconfig for benchmarks
-        run: |
-          K3D_IP=$(docker inspect k3d-tai-test-server-0 | jq -r '.[0].NetworkSettings.Networks["k3d-tai-test"].IPAddress')
-          k3d kubeconfig get tai-test > /tmp/kubeconfig-k3d.yml
-          sed "s|server: .*|server: https://${K3D_IP}:6443|" /tmp/kubeconfig-k3d.yml \
-            > /tmp/kubeconfig-tai-k8s.yml
-          sed 's|server: .*|server: https://127.0.0.1:6443|' /tmp/kubeconfig-k3d.yml \
-            > ${{ runner.temp }}/kubeconfig-tai.yml
-
       - name: Run Benchmarks
         env:
           TAI_TEST_HOST: "127.0.0.1"