diff --git a/.github/workflows/govmomi-build.yaml b/.github/workflows/govmomi-build.yaml
index b021852a1..e6f00fad4 100644
--- a/.github/workflows/govmomi-build.yaml
+++ b/.github/workflows/govmomi-build.yaml
@@ -27,6 +27,10 @@ on:
   
   workflow_dispatch:
 
+concurrency:
+  group: govmomi-build-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   artifacts:
     name: Build Snapshot Release (no upload)
@@ -50,9 +54,9 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-1.18-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go-1.18-
 
       - name: Create CHANGELOG
         env:
diff --git a/.github/workflows/govmomi-go-tests.yaml b/.github/workflows/govmomi-go-tests.yaml
index 1cc36926a..52de2cbbf 100644
--- a/.github/workflows/govmomi-go-tests.yaml
+++ b/.github/workflows/govmomi-go-tests.yaml
@@ -28,6 +28,7 @@ jobs:
       matrix:
         go-version: ["1.17", "1.18"]
         platform: ["ubuntu-20.04"]
+      fail-fast: false
 
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 10
@@ -48,9 +49,9 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go-${{ matrix.go-version }}-
 
       - name: Run Tests
         env:
diff --git a/.github/workflows/govmomi-govc-tests.yaml b/.github/workflows/govmomi-govc-tests.yaml
index bdc80a956..7bbc856db 100644
--- a/.github/workflows/govmomi-govc-tests.yaml
+++ b/.github/workflows/govmomi-govc-tests.yaml
@@ -21,16 +21,21 @@ on:
   pull_request:
     branches: ["main", "master"]
 
+concurrency:
+  group: govmomi-govc-tests-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   govc-tests:
     name: Run govc Tests
     strategy:
+      fail-fast: false
       matrix:
         go-version: ["1.17", "1.18"]
         platform: ["ubuntu-20.04"]
         cmd: ["govc-test"]
         experimental: [false]
-        timeout: [10]
+        timeout: [20]
         include:
           - go-version: "1.18"
             platform: "ubuntu-20.04"
@@ -63,9 +68,9 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go-${{ matrix.go-version }}-
 
       - name: Run ${{ matrix.cmd }}
         run: |
@@ -97,9 +102,9 @@ jobs:
           path: |
             ~/.cache/go-build
             ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go-${{ matrix.go-version }}-
 
       - name: Run "make doc"
         run: |