diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index ffa788a..c71677d 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -85,7 +85,7 @@ done )
 
 # Define some CONFIG variables as rpm macros as well. (rpm cannot handle
 # defining them all at once.)
-%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_HASH CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES CONFIG_DEBUG_INFO_BTF_MODULES
+%define config_vars CONFIG_MODULES CONFIG_MODULE_SIG CONFIG_MODULE_SIG_HASH CONFIG_KMSG_IDS CONFIG_SUSE_KERNEL_SUPPORTED CONFIG_EFI_STUB CONFIG_LIVEPATCH_IPA_CLONES CONFIG_DEBUG_INFO_BTF_MODULES CONFIG_PREEMPT_DYNAMIC
 %{expand:%(eval "$(test -n "%cpu_arch_flavor" && tar -xjf %_sourcedir/config.tar.bz2 --to-stdout config/%cpu_arch_flavor)"; for config in %config_vars; do echo "%%global $config ${!config:-n}"; done)}
 %define split_extra ("%CONFIG_MODULES" == "y" && "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y")
 
@@ -260,6 +260,13 @@ BuildArch:      i686
 %endif
 %endif
 
+%if %build_default
+%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
+Provides:       kernel-preempt = %version-%release
+Provides:       kernel-preempt_%_target_cpu = %version-%source_rel
+%endif
+%endif
+
 # Will modules not listed in supported.conf abort the kernel build (0/1)?
 %define supported_modules_check 0
 
@@ -1128,6 +1135,12 @@ Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
+%if %build_default
+%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
+Provides:       kernel-preempt-extra = %version-%release
+Provides:       kernel-preempt-extra_%_target_cpu = %version-%source_rel
+%endif
+%endif
 
 %description extra
 @DESCRIPTION@
@@ -1191,6 +1204,12 @@ Supplements:    packageand(product(Leap):%{name}_%_target_cpu)
 %ifarch %ix86
 Conflicts:      libc.so.6()(64bit)
 %endif
+%if %build_default
+%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
+Provides:       kernel-preempt-optional = %version-%release
+Provides:       kernel-preempt-optional_%_target_cpu = %version-%source_rel
+%endif
+%endif
 
 %description optional
 @DESCRIPTION@
@@ -1285,6 +1304,11 @@ Supplements:    packageand(%name:kernel-source-vanilla)
 %if "%CONFIG_DEBUG_INFO_BTF_MODULES" == "y"
 Requires:       dwarves >= 1.22
 %endif
+%if %build_default
+%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
+Provides:       kernel-preempt-devel = %version-%release
+%endif
+%endif
 @PROVIDES_OBSOLETES_DEVEL@
 %obsolete_rebuilds %name-devel
 PreReq:         coreutils
@@ -1376,6 +1400,11 @@ Provides:       multiversion(kernel)
 # tell weak-modules2 to ignore this package
 Provides:       kmp_in_kernel
 Requires(post): suse-module-tools >= 12.4
+%if %build_default
+%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
+Provides:       @KMP_NAME@-preempt = %version-%release
+%endif
+%endif
 Enhances:	%name
 Supplements:	packageand(%name:%@KMP_NAME@-%build_flavor)
 @KMP_DEPS@
diff --git a/rpm/kernel-source.spec.in b/rpm/kernel-source.spec.in
index e99b865..035623d 100644
--- a/rpm/kernel-source.spec.in
+++ b/rpm/kernel-source.spec.in
@@ -150,7 +150,6 @@ Recommends:     kernel-install-tools
 %define _binary_payload w9.bzdio
 
 %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
 
 %define do_vanilla "%variant" == ""
 
diff --git a/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile b/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile
index 1d5cbc7..38868cb 100644
--- a/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile
+++ b/scripts/git_sort/tests/Docker/opensuse-15.4.Dockerfile
@@ -12,7 +12,7 @@ RUN git config --global user.name "Your Name"
 
 COPY Kernel.gpg /tmp
 RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15_SP4/Kernel:tools.repo
+RUN zypper -n ar -f https://download.opensuse.org/repositories/Kernel:/tools/SLE_15_SP4/Kernel:tools.repo
 RUN zypper -n in python3-pygit2 quilt
 
 FROM packages
diff --git a/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile b/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile
index af6cfbc..a3956e5 100644
--- a/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile
+++ b/scripts/git_sort/tests/Docker/opensuse-tumbleweed.Dockerfile
@@ -12,7 +12,7 @@ RUN git config --global user.name "Your Name"
 
 COPY Kernel.gpg /tmp
 RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo
+RUN zypper -n ar -f https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo
 RUN zypper -n in --from Kernel_tools quilt
 
 FROM packages
diff --git a/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile b/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile
index 49d8f9c..e5c6989 100644
--- a/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile
+++ b/scripts/git_sort/tests/Docker/sle12-sp4.Dockerfile
@@ -2,15 +2,13 @@
 FROM registry.suse.de/suse/containers/sle-server/12-sp4/containers/suse/sles12sp4:latest AS base
 
 RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
 # RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP4/$(rpm -E %_arch)/product/ SDK
-RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo
-
-RUN zypper -n ref
+RUN zypper -n ar -f http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo
 
 FROM base AS packages
 
@@ -21,7 +19,7 @@ RUN git config --global user.name "Your Name"
 
 COPY Kernel.gpg /tmp
 RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo
+RUN zypper -n ar -f https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo
 RUN zypper -n in python3-pygit2 quilt
 
 FROM packages
diff --git a/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile b/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile
index f5e2f58..92bf25c 100644
--- a/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile
+++ b/scripts/git_sort/tests/Docker/sle12-sp5.Dockerfile
@@ -2,15 +2,13 @@
 FROM registry.suse.de/suse/containers/sle-server/12-sp5/containers/suse/sles12sp5:latest AS base
 
 RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
-RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2
+RUN zypper -n ar -f http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3
 # RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP5/$(rpm -E %_arch)/product/ SDK
-RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo
-
-RUN zypper -n ref
+RUN zypper -n ar -f http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo
 
 FROM base AS packages
 
@@ -21,7 +19,7 @@ RUN git config --global user.name "Your Name"
 
 COPY Kernel.gpg /tmp
 RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo
+RUN zypper -n ar -f https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo
 RUN zypper -n in python3-pygit2 quilt
 
 FROM packages
diff --git a/scripts/git_sort/tests/Docker/sle15.Dockerfile b/scripts/git_sort/tests/Docker/sle15.Dockerfile
index 4d1cc54..8b36b2f 100644
--- a/scripts/git_sort/tests/Docker/sle15.Dockerfile
+++ b/scripts/git_sort/tests/Docker/sle15.Dockerfile
@@ -2,8 +2,8 @@
 FROM registry.suse.de/suse/sle-15/update/images/suse/sle15:latest AS base
 
 RUN rpm -e container-suseconnect
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo
-RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo
+RUN zypper -n ar -f http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo
 RUN zypper -n ref
 
 FROM base AS packages
@@ -15,7 +15,7 @@ RUN git config --global user.name "Your Name"
 
 COPY Kernel.gpg /tmp
 RUN rpmkeys --import /tmp/Kernel.gpg
-RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo
+RUN zypper -n ar -f https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo
 RUN zypper -n in python3-pygit2 quilt
 
 FROM packages