diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map
index d9f0a15be..bcbbf92f5 100644
--- a/diskimage_builder/elements/bootloader/pkg-map
+++ b/diskimage_builder/elements/bootloader/pkg-map
@@ -13,7 +13,8 @@
       "dkms_package": "",
       "extlinux": "syslinux",
       "grub-pc": "grub2",
-      "grub-efi": "grub2"
+      "grub-efi": "grub2",
+      "grub-efi-amd64": "grub2-x86_64-efi"
     },
     "redhat": {
       "extlinux": "syslinux-extlinux",
diff --git a/diskimage_builder/elements/opensuse/README.rst b/diskimage_builder/elements/opensuse/README.rst
index d4c75ade1..72bda46c6 100644
--- a/diskimage_builder/elements/opensuse/README.rst
+++ b/diskimage_builder/elements/opensuse/README.rst
@@ -14,7 +14,7 @@ Environment Variables
 
 DIB_RELEASE
   :Required: No
-  :Default: 15.3
+  :Default: 15.5
   :Description: Set the desired openSUSE release.
 
 DIB_CLOUD_IMAGES
diff --git a/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash b/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
index ed8327d2c..5fc5cbc11 100644
--- a/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
+++ b/diskimage_builder/elements/opensuse/environment.d/10-opensuse-distro-name.bash
@@ -1,10 +1,10 @@
 export DISTRO_NAME=opensuse
-export DIB_RELEASE=${DIB_RELEASE:-15.3}
+export DIB_RELEASE=${DIB_RELEASE:-15.5}
 export EFI_BOOT_DIR="EFI/opensuse"
 export DIB_OPENSUSE_PATTERNS=patterns-openSUSE-base
 export DIB_INIT_SYSTEM=systemd
 case ${DIB_RELEASE} in
-    15.3) export OPENSUSE_REPO_DIR=openSUSE_Leap_${DIB_RELEASE} ;;
+    15.5) export OPENSUSE_REPO_DIR=openSUSE_Leap_${DIB_RELEASE} ;;
     *) echo "Unsupported openSUSE release: ${DIB_RELEASE}"; exit 1 ;;
 esac
 
diff --git a/diskimage_builder/elements/opensuse/package-installs.yaml b/diskimage_builder/elements/opensuse/package-installs.yaml
index 16141071a..a6aa8b039 100644
--- a/diskimage_builder/elements/opensuse/package-installs.yaml
+++ b/diskimage_builder/elements/opensuse/package-installs.yaml
@@ -4,3 +4,5 @@ sudo:
 kernel-devel:
 # lsb-release is not included by default.
 lsb-release:
+# Compatibility for zypper element scripts using deprecated mkinitrd
+dracut-mkinitrd-deprecated:
diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst
index c89b1cf23..3d5af1a04 100644
--- a/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst
+++ b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/README.rst
@@ -1 +1 @@
-Verify we can build an openSUSE Leap 15.3 image.
+Verify we can build an openSUSE Leap 15.5 image.
diff --git a/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash
index 4af58d2bb..28face9e2 100644
--- a/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash
+++ b/diskimage_builder/elements/opensuse/test-elements/opensuse15-build-succeeds/environment.d/10-set-distro.bash
@@ -1 +1 @@
-export DIB_RELEASE=15.3
+export DIB_RELEASE=15.5
diff --git a/doc/source/user_guide/supported_distros.rst b/doc/source/user_guide/supported_distros.rst
index f28e68d29..bda43ae33 100644
--- a/doc/source/user_guide/supported_distros.rst
+++ b/doc/source/user_guide/supported_distros.rst
@@ -104,7 +104,7 @@ versions:
 * ``openeuler-minimal``: 22.03-LTS
 * ``centos`` : (image-based build) 8-stream and 9-stream
 * ``fedora`` : (image-based build) latest
-* ``opensuse`` : 15.3
+* ``opensuse`` : 15.5
 * ``ubuntu`` : Bionic and Focal
 
 For ARM64, we also run functional tests on