diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 89423f11..b3c6834e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   test:
     name: test
-    runs-on: ubuntu-latest
+    runs-on: edera-large
     env:
       FIRMWARE_URL: "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-20250410.tar.xz"
       FIRMWARE_SIG_URL: "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-20250410.tar.sign"
diff --git a/config.yaml b/config.yaml
index 05951121..a47b57ef 100644
--- a/config.yaml
+++ b/config.yaml
@@ -4,7 +4,7 @@ architectures:
 - aarch64
 flavors:
 - name: zone
-- name: zone-debug
+- name: zone-bpf
   constraints:
     lower: '6.1'
 - name: zone-amdgpu
diff --git a/configs/aarch64/zone-debug.fragment.config b/configs/aarch64/zone-bpf.fragment.config
similarity index 65%
rename from configs/aarch64/zone-debug.fragment.config
rename to configs/aarch64/zone-bpf.fragment.config
index 12e5123b..1de51b8b 100644
--- a/configs/aarch64/zone-debug.fragment.config
+++ b/configs/aarch64/zone-bpf.fragment.config
@@ -1,12 +1,13 @@
 #
 # Edera kernel config snippet
-# - Generated from delta config: configs/aarch64/zone-debug.fragment.config
+# - Generated from delta config: configs/aarch64/zone-bpf.fragment.config
 # - Against base config: configs/aarch64/zone.config
 #
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_INFO_REDUCED=n
+CONFIG_DEBUG_INFO_SPLIT=n
 CONFIG_DEBUG_INFO_NONE=n
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
-
+CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y
diff --git a/configs/x86_64/host.config b/configs/x86_64/host.config
index 9ad0ceac..f7ce9144 100644
--- a/configs/x86_64/host.config
+++ b/configs/x86_64/host.config
@@ -5961,3 +5961,10 @@ CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_ARCH_USE_MEMTEST=y
 
+# BTF support (needed by some eBPF stuff)
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+CONFIG_DEBUG_INFO_REDUCED=n
+CONFIG_DEBUG_INFO_NONE=n
+CONFIG_DEBUG_INFO_BTF=y
+CONFIG_DEBUG_INFO_BTF_MODULES=y
diff --git a/configs/x86_64/zone-debug.fragment.config b/configs/x86_64/zone-bpf.fragment.config
similarity index 84%
rename from configs/x86_64/zone-debug.fragment.config
rename to configs/x86_64/zone-bpf.fragment.config
index 22e77add..a8f51fd5 100644
--- a/configs/x86_64/zone-debug.fragment.config
+++ b/configs/x86_64/zone-bpf.fragment.config
@@ -6,7 +6,8 @@
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
 CONFIG_DEBUG_INFO_REDUCED=n
+CONFIG_DEBUG_INFO_SPLIT=n
 CONFIG_DEBUG_INFO_NONE=n
 CONFIG_DEBUG_INFO_BTF=y
 CONFIG_DEBUG_INFO_BTF_MODULES=y
-
+CONFIG_DEBUG_INFO_COMPRESSED_ZSTD=y
diff --git a/hack/build/build.sh b/hack/build/build.sh
index f5561bd5..0d0f4712 100755
--- a/hack/build/build.sh
+++ b/hack/build/build.sh
@@ -38,8 +38,8 @@ SQUASH_SIZE=$(stat -c %s "${ADDONS_SQUASHFS_PATH}")
 # We don't really care how big the host kernel is.
 # Nvidia kernels have chonker firmwares, even compressed (like 200MB total size), so not much we can really do there.
 case "$KERNEL_FLAVOR" in
-    zone-debug)
-        # Skip the check for zone-debug, it is allowed to be big
+    zone-bpf)
+        # Skip the check for zone-bpf, it is allowed to be big
         ;;
     zone-nvidiagpu)
         # Firmware means this is unavoidably quite large