diff --git a/config.yaml b/config.yaml
index 3b3f8fb..eb6c4e8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -281,18 +281,24 @@ actions:
                       SBATsuffix="rhel"
               %else
         count: 1
-      - target: "spec"
+      - target: "uki.sbat.template"
         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
+              sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+              kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,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.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,almalinux,1,AlmaLinux,kernel-uki-virt,$KernelVer,mailto:security@almalinux.org
+              sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+              kernel-uki-virt.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt,@KVER,mailto:secalert@redhat.com
+              kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,@KVER,mailto:security@almalinux.org
+        count: 1
+      - target: "uki-addons.sbat.template"
+        find: |
+              sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+              kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
+        replace: |
+              sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+              kernel-uki-virt-addons.@SBAT_SUFFIX,1,Red Hat,kernel-uki-virt-addons,@KVER,mailto:secalert@redhat.com
+              kernel-uki-virt-addons.almalinux,1,AlmaLinux,kernel-uki-virt-addons,@KVER,mailto:security@almalinux.org
+
         count: 1
       - target: "x509.genkey.centos"
         find: |