diff --git a/PKGBUILD b/PKGBUILD
index b0f6a40..4e67d57 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.18
+pkgver=10.0.19
 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=('7bc3e2af9c70b50cdfa4e65e75b2a23b')
+md5sums=('57e3c2063f957f448bd085685fa1358a')
 
 
 build() {
diff --git a/python-kiwi.changes b/python-kiwi.changes
index 8fda0b5..ad9163c 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu May 30 21:55:20 CEST 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
+
+- Bump version: 10.0.18 → 10.0.19
+
+-------------------------------------------------------------------
+Wed May 29 21:22:38 CEST 2024 - Neal Gompa <neal@gompa.dev>
+
+- package: Always include patches and number all sources and patches
+
+  This ensures that stuff is applied reliably and all sources and patches
+  are included as expected.
+
+  Then the added kiwi-revert-bls-default-for-suse.patch is applied
+  conditionally for SUSE distributions.
+
 -------------------------------------------------------------------
 Wed May 29 18:18:26 CEST 2024 - Marcus Schäfer <marcus.schaefer@gmail.com>
 
diff --git a/python-kiwi.spec b/python-kiwi.spec
index 694abab..7019dd8 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -44,7 +44,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        10.0.18
+Version:        10.0.19
 Provides:       kiwi-schema = 8.1
 Release:        0
 Url:            https://github.com/OSInside/kiwi
@@ -55,13 +55,11 @@ License:        GPL-3.0-or-later
 Packager:       Marcus Schaefer <marcus.schaefer@suse.com>
 %endif
 Group:          %{pygroup}
-Source:         %{name}.tar.gz
+Source0:        %{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
+# SUSE-specific patches (1001+)
+## PATCH-FIX-OPENSUSE kiwi-revert-bls-default-for-suse.patch -- temporary until opensuse has bls
+Patch1001:      kiwi-revert-bls-default-for-suse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:  fdupes
@@ -641,7 +639,12 @@ Group:          %{sysgroup}
 Provides manual pages to describe the kiwi commands
 
 %prep
-%autosetup -p1 -n kiwi-%{version}
+%setup -q -n kiwi-%{version}
+
+%if 0%{?suse_version}
+# Temporarily revert grub-bls default to false for SUSE distributions
+%patch -P 1001 -p1
+%endif
 
 # 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 8e3b002..0e0a0de 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:8901c974af68bd2954219fd4993c4444e85afb09ef3dc8f561753c9144fa1fd0
-size 1020470
+oid sha256:7e82753e7ab32c9d10a2741b6f51fb44698e4a4d47eceb4cf8767444e14d8538
+size 1024756