diff --git a/.github/workflows/aws-e2e.yaml b/.github/workflows/aws-e2e.yaml
index 4c79dd645..e40f37b6a 100644
--- a/.github/workflows/aws-e2e.yaml
+++ b/.github/workflows/aws-e2e.yaml
@@ -141,7 +141,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/azure-e2e.yaml b/.github/workflows/azure-e2e.yaml
index 251aaae9f..2bc1caf06 100644
--- a/.github/workflows/azure-e2e.yaml
+++ b/.github/workflows/azure-e2e.yaml
@@ -50,7 +50,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Run E2E test for ${{ matrix.os }} with ${{ matrix.buildConfig }} configuration
         uses: magefile/mage-action@v3
diff --git a/.github/workflows/build-devkit-image.yaml b/.github/workflows/build-devkit-image.yaml
index 7882048fc..5b59335b8 100644
--- a/.github/workflows/build-devkit-image.yaml
+++ b/.github/workflows/build-devkit-image.yaml
@@ -48,7 +48,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and Push multi arch devkit image
         run: make devkit-image-push-manifest
diff --git a/.github/workflows/gcp-e2e.yaml b/.github/workflows/gcp-e2e.yaml
index dfe1976bf..f74a904d0 100644
--- a/.github/workflows/gcp-e2e.yaml
+++ b/.github/workflows/gcp-e2e.yaml
@@ -51,7 +51,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Setup GOOGLE_APPLICATION_CREDENTIALS
         run: |-
diff --git a/.github/workflows/podman-aws-e2e.yaml b/.github/workflows/podman-aws-e2e.yaml
index fda82f8c1..2ff78fe6f 100644
--- a/.github/workflows/podman-aws-e2e.yaml
+++ b/.github/workflows/podman-aws-e2e.yaml
@@ -39,7 +39,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/release-ami.yaml b/.github/workflows/release-ami.yaml
index 5b5bdb65f..be870f851 100644
--- a/.github/workflows/release-ami.yaml
+++ b/.github/workflows/release-ami.yaml
@@ -81,7 +81,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
diff --git a/.github/workflows/release-azure.yaml b/.github/workflows/release-azure.yaml
index cb9b94d74..69c2e1ceb 100644
--- a/.github/workflows/release-azure.yaml
+++ b/.github/workflows/release-azure.yaml
@@ -52,7 +52,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build Image ${{ matrix.os }} with ${{ matrix.buildConfig }} for Azure
         uses: magefile/mage-action@v3
diff --git a/.github/workflows/release-gcp-template.yaml b/.github/workflows/release-gcp-template.yaml
index 905a80c99..cd864485a 100644
--- a/.github/workflows/release-gcp-template.yaml
+++ b/.github/workflows/release-gcp-template.yaml
@@ -50,7 +50,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Setup GOOGLE_APPLICATION_CREDENTIALS
         run: |-
diff --git a/.github/workflows/release-kib.yaml b/.github/workflows/release-kib.yaml
index d4bcf8f2d..ee13eec54 100644
--- a/.github/workflows/release-kib.yaml
+++ b/.github/workflows/release-kib.yaml
@@ -38,7 +38,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Release
         run: make release
diff --git a/.github/workflows/release-vsphere-template.yaml b/.github/workflows/release-vsphere-template.yaml
index 31917d877..b995a5a70 100644
--- a/.github/workflows/release-vsphere-template.yaml
+++ b/.github/workflows/release-vsphere-template.yaml
@@ -58,7 +58,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Setup SSH agent with private key to connect with pre-configured bastion host
         uses: webfactory/ssh-agent@v0.8.0
diff --git a/.github/workflows/vsphere-e2e.yaml b/.github/workflows/vsphere-e2e.yaml
index 98e358b06..117da3b37 100644
--- a/.github/workflows/vsphere-e2e.yaml
+++ b/.github/workflows/vsphere-e2e.yaml
@@ -67,7 +67,7 @@ jobs:
           password: ${{ secrets.NEXUS_PASSWORD }}
 
       - name: Setup buildkit
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Setup SSH agent with private key to connect with pre-configured bastion host
         uses: webfactory/ssh-agent@v0.8.0
diff --git a/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl b/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl
index 8ce5aba44..ca01bc8b3 100644
--- a/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl
+++ b/test/infra/vsphere/packer-vsphere-airgap.yaml.tmpl
@@ -16,3 +16,4 @@ packer:
   network: "Airgapped"
   resource_pool: "Users"
   ssh_username: "kib"
+  linked_clone: "false"