diff --git a/.github/workflows/build-arm64.yaml b/.github/workflows/build-arm64.yaml
index ff3f6b0..4938471 100644
--- a/.github/workflows/build-arm64.yaml
+++ b/.github/workflows/build-arm64.yaml
@@ -60,7 +60,7 @@ jobs:
       uses: mikefarah/yq@v4.40.4
       id: kernel_version
       with:
-        cmd: yq -r '.version' packages/kernels/upstream/definition.yaml
+        cmd: yq -r '.labels| with_entries(select(.key == "package.version"))|.[]' packages/kernels/upstream/definition.yaml
     # this builds the kernel cross-compiled for arm64 so its faster
     # notice that wee are not using builx nor platform so it runs under amd64
     # This is much faster than building the kernel on arm64 via buildx and --platform
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index c31a157..2afe8a0 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -26,7 +26,7 @@ jobs:
       uses: mikefarah/yq@v4.40.4
       id: kernel_version
       with:
-        cmd: yq -r '.version' packages/kernels/upstream/definition.yaml
+        cmd: yq -r '.labels| with_entries(select(.key == "package.version"))|.[]' packages/kernels/upstream/definition.yaml
     # this builds the kernel cross-compiled for arm64 so its faster
     # notice that wee are not using builx nor platform so it runs under amd64
     # This is much faster than building the kernel on arm64 via buildx and --platform
diff --git a/packages/kernels/upstream/build.yaml b/packages/kernels/upstream/build.yaml
index d54a2ea..7fef142 100644
--- a/packages/kernels/upstream/build.yaml
+++ b/packages/kernels/upstream/build.yaml
@@ -2,9 +2,9 @@ image: "fedora:latest"
 package_dir: "/package"
 prelude:
   - dnf update -y && dnf install -y gcc make bison flex openssl openssl-devel elfutils-libelf-devel bc kmod xxd wget xz dwarves python3 cpio perl gettext diffutils bash coreutils tar which bzip2 findutils m4 perl-interpreter perl-Carp perl-devel perl-generators make diffutils gawk binutils redhat-rpm-config hmaccalc gcc-c++ python3-devel zstd gcc-c++-aarch64-linux-gnu binutils-aarch64-linux-gnu gcc-aarch64-linux-gnu
-  - wget https://cdn.kernel.org/pub/linux/kernel/v${PACKAGE_VERSION%%.*}.x/linux-${PACKAGE_VERSION}.tar.xz
+  - wget https://cdn.kernel.org/pub/linux/kernel/v${PACKAGE_VERSION%%.*}.x/linux-${PACKAGE_VERSION%\-*}.tar.xz
   - ls -lh
-  - tar xf linux-${PACKAGE_VERSION}.tar.xz
+  - tar xf linux-${PACKAGE_VERSION%\-*}.tar.xz
 env:
 {{ if .Values.arch }}
   {{ if eq .Values.arch "arm64" }}
@@ -16,32 +16,32 @@ env:
 {{end}}
 steps:
   - mkdir -p /package/boot
-  - mkdir -p /package/lib/modules/${PACKAGE_VERSION}/
+  - mkdir -p /package/lib/modules/${PACKAGE_VERSION%\-*}/
 {{ if .Values.arch }}
   {{ if eq .Values.arch "arm64" }}
-  - cp configs/arm64.config linux-${PACKAGE_VERSION}/.config
+  - cp configs/arm64.config linux-${PACKAGE_VERSION%\-*}/.config
   {{ else }}
-  - cp configs/x86.config linux-${PACKAGE_VERSION}/.config
+  - cp configs/x86.config linux-${PACKAGE_VERSION%\-*}/.config
   {{ end }}
 {{ end }}
-  - cd linux-${PACKAGE_VERSION} && make olddefconfig
+  - cd linux-${PACKAGE_VERSION%\-*} && make olddefconfig
 {{ if .Values.arch }}
   {{ if eq .Values.arch "arm64" }}
-  - diff configs/arm64.config linux-${PACKAGE_VERSION}/.config || true
+  - diff configs/arm64.config linux-${PACKAGE_VERSION%\-*}/.config || true
   {{ else }}
-  - diff configs/x86.config linux-${PACKAGE_VERSION}/.config || true
+  - diff configs/x86.config linux-${PACKAGE_VERSION%\-*}/.config || true
   {{ end }}
 {{ end }}
-  - cd linux-${PACKAGE_VERSION} && make kernelversion
+  - cd linux-${PACKAGE_VERSION%\-*} && make kernelversion
 {{ if .Values.arch }}
   {{ if eq .Values.arch "arm64" }}
-  - cd linux-${PACKAGE_VERSION} && make -j$(nproc) Image
+  - cd linux-${PACKAGE_VERSION%\-*} && make -j$(nproc) Image
   {{ else }}
-  - cd linux-${PACKAGE_VERSION} && make -j$(nproc) bzImage
+  - cd linux-${PACKAGE_VERSION%\-*} && make -j$(nproc) bzImage
   {{ end }}
 {{ end }}
-  - cd linux-${PACKAGE_VERSION} && make -j$(nproc) modules
-  - cd linux-${PACKAGE_VERSION} && make install
-  - cd linux-${PACKAGE_VERSION} && ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="/package/" INSTALL_MOD_STRIP=1 modules_install
+  - cd linux-${PACKAGE_VERSION%\-*} && make -j$(nproc) modules
+  - cd linux-${PACKAGE_VERSION%\-*} && make install
+  - cd linux-${PACKAGE_VERSION%\-*} && ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="/package/" INSTALL_MOD_STRIP=1 modules_install
   - cp /boot/* /package/boot