diff --git a/.github/workflows/buildenv-diff.yml b/.github/workflows/buildenv-diff.yml
index 06c743c..9e417b8 100644
--- a/.github/workflows/buildenv-diff.yml
+++ b/.github/workflows/buildenv-diff.yml
@@ -15,7 +15,7 @@ jobs:
     name: package diff
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/.github/workflows/buildenv.yml b/.github/workflows/buildenv.yml
index 15e04a3..52378e0 100644
--- a/.github/workflows/buildenv.yml
+++ b/.github/workflows/buildenv.yml
@@ -86,7 +86,7 @@ jobs:
     needs: build
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/.github/workflows/digestabot.yml b/.github/workflows/digestabot.yml
index 789d048..33d0509 100644
--- a/.github/workflows/digestabot.yml
+++ b/.github/workflows/digestabot.yml
@@ -19,7 +19,7 @@ jobs:
     name: Image digest update
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
 
     permissions:
       contents: write # to push the updates
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cee2541..069d762 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
   format:
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     env:
       SHFMT_VERSION: "3.12.0"
       SHELLCHECK_VERSION: "0.11.0"
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
index fafc667..9639181 100644
--- a/.github/workflows/matrix.yml
+++ b/.github/workflows/matrix.yml
@@ -21,7 +21,7 @@ jobs:
     name: matrix
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     steps:
     - name: Harden the runner (Audit all outbound calls)
       uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
@@ -190,7 +190,7 @@ jobs:
       matrix: ${{ fromJSON(needs.matrix.outputs.merges) }}
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     env:
       KERNEL_PUBLISH: "${{ inputs.publish }}"
       KERNEL_VERSION: "${{ matrix.merges.version }}"
diff --git a/.github/workflows/refresh-nvidia.yml b/.github/workflows/refresh-nvidia.yml
index 17b1e23..83d1cd4 100644
--- a/.github/workflows/refresh-nvidia.yml
+++ b/.github/workflows/refresh-nvidia.yml
@@ -12,7 +12,7 @@ jobs:
     name: Open PR if NVIDIA versions changed
     runs-on:
       group: Self Hosted
-      labels: edera-24
+      labels: edera-16
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@b09bb98e06d4d774595224525879c09bc6e98c40 # v2.20.1
diff --git a/config.yaml b/config.yaml
index 27ce25d..9d74d33 100644
--- a/config.yaml
+++ b/config.yaml
@@ -12,6 +12,12 @@ flavors:
   - aarch64
   constraints:
     lower: '6.1'
+- name: zone-kvm
+  # zone kernel built with kvm and nbd enabled for e2e testing in the protect repo
+  architectures:
+  - x86_64
+  constraints:
+    lower: '6.1'
 - name: zone-amdgpu
   constraints:
     lower: '6.1'
diff --git a/configs/x86_64/zone-kvm.fragment.config b/configs/x86_64/zone-kvm.fragment.config
new file mode 100644
index 0000000..f7c0963
--- /dev/null
+++ b/configs/x86_64/zone-kvm.fragment.config
@@ -0,0 +1,8 @@
+#
+# Edera kernel config snippet
+# - Generated from delta config: ./configs/x86_64/zone-kvm.fragment.config
+# - Against base config: /var/folders/78/9jm2w27s15b1xv2vgw8qdk9w0000gn/T/tmp.4SHerIaCTP-zone-5.4.293-amd64/kernel/config
+#
+CONFIG_KVM=y
+CONFIG_KVM_AMD=y
+CONFIG_BLK_DEV_NBD=y