diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6b31fece..20e83a83f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ env:
   GOOGLE_PROJECT: pulumi-ci-gcp-provider
   GOOGLE_PROJECT_NUMBER: 895284651812
   LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
-  SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops"
+  SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container,vm-azure-yaml"
   PULUMI_API: https://api.pulumi-staging.io
   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
   PULUMI_VERSION: ${{ github.event.client_payload.ref }}
@@ -125,14 +125,11 @@ jobs:
         env:
           PULUMI_PYTHON_CMD: python
           TESTPARALLELISM: 3
-          SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container"
       - if: contains(matrix.platform, 'macos')
         name: Running macOS tests
         run: |
           set -euo pipefail
           cd tests && go test -v -json -count=1 -cover -timeout 6h -parallel ${{ env.TESTPARALLELISM }} . 2>&1 | gotestfmt
-        env:
-          SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container"
       - if: contains(matrix.platform, 'ubuntu')
         name: Running Linux tests
         run: |
diff --git a/.github/workflows/run-templates-command.yml b/.github/workflows/run-templates-command.yml
index 6a78e65f0..6e568bfd4 100644
--- a/.github/workflows/run-templates-command.yml
+++ b/.github/workflows/run-templates-command.yml
@@ -17,7 +17,7 @@ env:
   GOOGLE_PROJECT: pulumi-ci-gcp-provider
   GOOGLE_PROJECT_NUMBER: 895284651812
   LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
-  SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops"
+  SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container,vm-azure-yaml,kubernetes-azure-yaml"
   PULUMI_API: https://api.pulumi-staging.io
   ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
   ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
@@ -130,14 +130,11 @@ jobs:
         env:
           PULUMI_PYTHON_CMD: python
           TESTPARALLELISM: 3
-          SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container"
       - if: contains(matrix.platform, 'macOS')
         name: Running macOS tests
         run: |
           set -euo pipefail
           cd tests && go test -v -json -count=1 -cover -timeout 6h -parallel ${{ env.TESTPARALLELISM }} . 2>&1 | gotestfmt
-        env:
-          SKIPPED_TESTS: "alicloud,digitalocean,kubernetes,openstack,equinix-metal,civo,aiven,auth0,github,oci,java-jbang,java-gradle,azuredevops,container"
       - if: contains(matrix.platform, 'ubuntu')
         name: Running Linux tests
         run: |
diff --git a/equinix-metal-go/go.mod b/equinix-metal-go/go.mod
index ca2a59ee7..8d8120c4f 100644
--- a/equinix-metal-go/go.mod
+++ b/equinix-metal-go/go.mod
@@ -3,6 +3,6 @@ module ${PROJECT}
 go 1.17
 
 require (
-	github.com/pulumi/pulumi-equinix-metal/sdk/v2 v3.2.1
+	github.com/pulumi/pulumi-equinix-metal/sdk/v3 v3.2.1
 	github.com/pulumi/pulumi/sdk/v3 v3.51.0
 )
diff --git a/github-go/go.mod b/github-go/go.mod
index 898a133e3..955dd0174 100644
--- a/github-go/go.mod
+++ b/github-go/go.mod
@@ -3,7 +3,6 @@ module ${PROJECT}
 go 1.17
 
 require (
-	github.com/pulumi/pulumi-github/sdk/v4 v5.1.0
+	github.com/pulumi/pulumi-github/sdk/v5 v5.1.0
 	github.com/pulumi/pulumi/sdk/v3 v3.51.0
 )
-
diff --git a/tests/template_test.go b/tests/template_test.go
index 8feb19fd3..6330e377b 100644
--- a/tests/template_test.go
+++ b/tests/template_test.go
@@ -40,6 +40,10 @@ func TestTemplates(t *testing.T) {
 				UseAutomaticVirtualEnv: true,
 				PrepareProject:         testutils.PrepareProject(t, e),
 				RequireService:         true,
+
+				// Skip updates to allow tests to complete more reliably.
+				// See https://github.com/pulumi/devrel-team/issues/464 for details.
+				SkipUpdate: true,
 			})
 		})
 	}