diff --git a/PKGBUILD b/PKGBUILD
index cfb9a35..b0f6a40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
 arch=(x86_64)
-pkgver=10.0.17
+pkgver=10.0.18
 pkgrel=0
 pkgdesc="KIWI - Appliance Builder Next Generation"
 url="https://github.com/SUSE/kiwi/tarball/master"
@@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py
 provides=(kiwi-ng kiwi)
 source=("${pkgname}.tar.gz")
 changelog="${pkgname}.changes"
-md5sums=('cfd24d4e84eb2b8b96b17294217ca5b0')
+md5sums=('7bc3e2af9c70b50cdfa4e65e75b2a23b')
 
 
 build() {
diff --git a/python-kiwi.changes b/python-kiwi.changes
index 6d93ab7..8fda0b5 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed May 29 18:18:26 CEST 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Bump version: 10.0.17 → 10.0.18
+
+-------------------------------------------------------------------
+Wed May 29 16:54:21 CEST 2024 - Alberto Planas <aplanas@suse.com>
+
+- package: adjust openSUSE patch
+
 -------------------------------------------------------------------
 Wed May 29 15:18:38 CEST 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
 
diff --git a/python-kiwi.spec b/python-kiwi.spec
index 38cbdb3..694abab 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -44,7 +44,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        10.0.17
+Version:        10.0.18
 Provides:       kiwi-schema = 8.1
 Release:        0
 Url:            https://github.com/OSInside/kiwi
@@ -57,6 +57,11 @@ Packager:       Marcus Schaefer <marcus.schaefer@suse.com>
 Group:          %{pygroup}
 Source:         %{name}.tar.gz
 Source1:        %{name}-rpmlintrc
+# PATCH-FIX-OPENSUSE kiwi-revert-bls-default-for-suse.patch
+# Temporarily revert grub-bls default to false for SUSE distributions
+%if 0%{?suse_version}
+Patch:          kiwi-revert-bls-default-for-suse.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:  fdupes
@@ -636,12 +641,7 @@ Group:          %{sysgroup}
 Provides manual pages to describe the kiwi commands
 
 %prep
-%autosetup -n kiwi-%{version}
-
-# Temporarily revert grub-bls default to false for SUSE distributions
-%if 0%{?suse_version}
-patch -p1 < package/kiwi-revert-bls-default-for-suse.patch
-%endif
+%autosetup -p1 -n kiwi-%{version}
 
 # Temporarily switch things back to docopt for everything but Fedora 41+
 # FIXME: Drop this hack as soon as we can...
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index 9ee5b27..8e3b002 100644
--- a/python-kiwi.tar.gz
+++ b/python-kiwi.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a109cf9697251750bc9b4e2d722ea4105937ced331a3b6b855ebd9c574533db5
-size 1020512
+oid sha256:8901c974af68bd2954219fd4993c4444e85afb09ef3dc8f561753c9144fa1fd0
+size 1020470