diff --git a/config.yaml b/config.yaml
index ddf19dd..96c9346 100644
--- a/config.yaml
+++ b/config.yaml
@@ -157,22 +157,28 @@ actions:
         replace: "  sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME=\"AlmaLinux %{rhel} - Kernel Cryptographic API\"/' $i"
         count: 1
       - target: "spec"
-        find: "SBATsuffix=\"centos\""
-        replace: "SBATsuffix=\"rhel\""
+        find: "%global sbat_suffix centos"
+        replace: "%global sbat_suffix rhel"
         count: 1
       - target: "spec"
         find: |
               linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
-              linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
-              kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
+              linux.%{sbat_suffix},1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              kernel-uki-virt.%{sbat_suffix},1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
         replace: |
               linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
               linux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
-              linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
+              linux.%{sbat_suffix},1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
               linux.almalinux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
-              kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
+              kernel-uki-virt.%{sbat_suffix},1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
               kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,$KernelVer,mailto:security@almalinux.org
         count: 1
+      - target: "kernel.sbat.template"
+        find: "kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com"
+        replace: |
+              kernel.@SBAT_SUFFIX,1,Red Hat,kernel-core,@KVER,mailto:secalert@redhat.com
+              kernel.almalinux,1,AlmaLinux,kernel-core,@KVER,mailto:security@almalinux.org
+        count: 1
       - target: "spec"
         find: "UKI_secureboot_name=centossecureboot204"
         replace: "UKI_secureboot_name=almalinuxsecureboot0"
@@ -316,9 +322,9 @@ actions:
         count: 1
       - target: "spec"
         find: |
-              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime}
+              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime} && !%{with_realtime_arm64_64k}
         replace: |
-              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime} && !%{with_ppc_kvm}
+              %if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k} && !%{with_realtime} && !%{with_realtime_arm64_64k} && !%{with_ppc_kvm}
         count: 1
       - target: "spec"
         find: |