diff --git a/packages/livecd/grub2/build.yaml b/packages/livecd/grub2/build.yaml
index 2f5efc5..4f2e1eb 100644
--- a/packages/livecd/grub2/build.yaml
+++ b/packages/livecd/grub2/build.yaml
@@ -1,5 +1,4 @@
-{{if eq .Values.name "grub2"}}
-image: "opensuse/leap:15.4"
+image: "opensuse/leap:15.5"
 
 prelude:
 {{if .Values.arch }}
@@ -13,6 +12,7 @@ prelude:
 - cat /usr/share/grub2/i386-pc/cdboot.img /usr/share/grub2/i386-pc/core.img > /usr/share/grub2/i386-pc/eltorito.img
 
 steps:
+{{if eq .Values.name "grub2"}}
 - mkdir -p /boot/x86_64/loader
   {{if .Values.arch }}
     {{if eq .Values.arch "amd64"}}
@@ -31,18 +31,6 @@ steps:
 {{end}}
 
 {{if eq .Values.name "grub2-efi-image"}}
-image: "opensuse/tumbleweed"
-prelude:
-{{if .Values.arch }}
-  {{if eq .Values.arch "amd64"}}
-- zypper in -y shim grub2-x86_64-efi
-  {{end}}
-  {{if eq .Values.arch "arm64"}}
-- zypper in -y shim grub2-arm64-efi
-  {{end}}
-{{end}}
-- zypper cc
-steps:
 - mkdir -p /EFI/BOOT
   {{if .Values.arch }}
     {{if eq .Values.arch "amd64"}}
@@ -52,6 +40,7 @@ steps:
 - cp /usr/share/efi/x86_64/MokManager.efi /EFI/BOOT/MokManager.efi
     {{end}}
   {{if eq .Values.arch "arm64"}}
+- ls -ltra /usr/share/grub2/arm64-efi/
 # For removable drives the name of the efi needs to be bootaa64.efi
 - cp /usr/share/efi/aarch64/shim.efi /EFI/BOOT/bootaa64.efi
 - cp /usr/share/efi/aarch64/grub.efi /EFI/BOOT/grub.efi
@@ -59,4 +48,4 @@ steps:
     {{end}}
   {{end}}
 - cp config/grub_live_efi.cfg /EFI/BOOT/grub.cfg
-{{end}}
+{{end}}
\ No newline at end of file
diff --git a/packages/livecd/grub2/collection.yaml b/packages/livecd/grub2/collection.yaml
index 02f02d0..93a48e3 100644
--- a/packages/livecd/grub2/collection.yaml
+++ b/packages/livecd/grub2/collection.yaml
@@ -1,9 +1,9 @@
 packages:
   - name: "grub2"
     category: "livecd"
-    version: "0.0.11"
-    description: "Grub2 booloader for live systems"
+    version: "0.0.12"
+    description: "Grub2 bootloader for live systems"
   - name: "grub2-efi-image"
     category: "livecd"
-    version: "0.0.11"
-    description: "Grub2 booloader EFI image for live systems"
+    version: "0.0.12"
+    description: "Grub2 bootloader EFI image for live systems"
diff --git a/packages/system/grub2-efi/build.yaml b/packages/system/grub2-efi/build.yaml
index 736d0c9..d6ccdc7 100644
--- a/packages/system/grub2-efi/build.yaml
+++ b/packages/system/grub2-efi/build.yaml
@@ -1,4 +1,4 @@
-image: registry.opensuse.org/opensuse/tumbleweed
+image: registry.opensuse.org/opensuse/leap:15.5
 
 prelude:
 - zypper ref
diff --git a/packages/system/grub2-efi/definition.yaml b/packages/system/grub2-efi/definition.yaml
index e82bf01..e10b0b7 100644
--- a/packages/system/grub2-efi/definition.yaml
+++ b/packages/system/grub2-efi/definition.yaml
@@ -1,5 +1,5 @@
 name: "grub2-efi"
 category: "system"
-version: "2.06-150404"
+version: "2.06-150405"
 pversion: "2.06-150400.12.2"
 license: "GPL-3.0-or-later"