diff --git a/packages/kernels/build.yaml b/packages/kernels/build.yaml
index 7923723..01b2d6f 100644
--- a/packages/kernels/build.yaml
+++ b/packages/kernels/build.yaml
@@ -1,4 +1,4 @@
-image: "{{.Values.image}}:{{.Values.version}}"
+image: "{{.Values.image}}:{{.Values.image_tag}}"
 excludes:
 - ^/boot/grub2
 - ^/boot/initrd
@@ -14,7 +14,7 @@ steps:
 - zypper in -y --no-recommends {{.Values.packages}}
 - zypper cc
 {{ if .Values.arch }}
-  {{ if eq .Values.arch "aarch64" }}
+  {{ if eq .Values.arch "arm64" }}
 # aarch64 has an uncompressed kernel so we need to link it to vmlinuz
 - |
     kernel=$(ls /boot/Image-* | head -n1) && \
diff --git a/packages/kernels/collection.yaml b/packages/kernels/collection.yaml
index 8d30686..bc78bb9 100644
--- a/packages/kernels/collection.yaml
+++ b/packages/kernels/collection.yaml
@@ -1,7 +1,8 @@
 packages:
 - category: "distro-kernels"
   name: "opensuse"
-  version: "15.4"
+  version: "15.4+1"
+  image_tag: "15.4"
   image: "opensuse/leap"
   distribution: "opensuse"
   packages: "kernel-default dracut kernel-firmware-all tar btrfsprogs rsync gzip xz curl e2fsprogs squashfs wicked dhcp-client coreutils nfs-utils open-iscsi device-mapper iproute2 multipath-tools mdadm arping2 systemd"
@@ -9,10 +10,12 @@ packages:
   name: "fedora"
   version: "36"
   image: "fedora"
+  image_tag: "36"
   distribution: "fedora"
   packages: "kernel grub2 kernel-core dracut dracut-live"
 - category: "distro-kernels"
   name: "ubuntu"
+  image_tag: "20.04"
   version: "20.04"
   image: "ubuntu"
   distribution: "ubuntu"