diff --git a/configs/sst_desktop_firmware_bootloaders-efi-srpm-macros.yaml b/configs/sst_cs_bootloaders-efi-srpm-macros.yaml
similarity index 81%
rename from configs/sst_desktop_firmware_bootloaders-efi-srpm-macros.yaml
rename to configs/sst_cs_bootloaders-efi-srpm-macros.yaml
index 64085bdb..9357928d 100644
--- a/configs/sst_desktop_firmware_bootloaders-efi-srpm-macros.yaml
+++ b/configs/sst_cs_bootloaders-efi-srpm-macros.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: efi-srpm-macros
   description: Common RPM Macros for building EFI-related packages
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages:
     - efi-srpm-macros
   labels:
diff --git a/configs/sst_desktop_firmware_bootloaders-efibootmgr.yaml b/configs/sst_cs_bootloaders-efibootmgr.yaml
similarity index 83%
rename from configs/sst_desktop_firmware_bootloaders-efibootmgr.yaml
rename to configs/sst_cs_bootloaders-efibootmgr.yaml
index 3782f0ac..47eba320 100644
--- a/configs/sst_desktop_firmware_bootloaders-efibootmgr.yaml
+++ b/configs/sst_cs_bootloaders-efibootmgr.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: efibootmgr
   description: EFI Boot Manager
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-efivar.yaml b/configs/sst_cs_bootloaders-efivar.yaml
similarity index 83%
rename from configs/sst_desktop_firmware_bootloaders-efivar.yaml
rename to configs/sst_cs_bootloaders-efivar.yaml
index 7f237348..7ee5bb95 100644
--- a/configs/sst_desktop_firmware_bootloaders-efivar.yaml
+++ b/configs/sst_cs_bootloaders-efivar.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: efivar
   description: Tools to manage UEFI variables
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-fwupd.yaml b/configs/sst_cs_bootloaders-fwupd.yaml
similarity index 83%
rename from configs/sst_desktop_firmware_bootloaders-fwupd.yaml
rename to configs/sst_cs_bootloaders-fwupd.yaml
index 6dab27d6..f2eaf457 100644
--- a/configs/sst_desktop_firmware_bootloaders-fwupd.yaml
+++ b/configs/sst_cs_bootloaders-fwupd.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: fwupd
   description: Firmware update daemon
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages:
     - fwupd
   arch_packages:
diff --git a/configs/sst_desktop_firmware_bootloaders-gnu-efi.yaml b/configs/sst_cs_bootloaders-gnu-efi.yaml
similarity index 84%
rename from configs/sst_desktop_firmware_bootloaders-gnu-efi.yaml
rename to configs/sst_cs_bootloaders-gnu-efi.yaml
index 75bec78e..5fb5f26e 100644
--- a/configs/sst_desktop_firmware_bootloaders-gnu-efi.yaml
+++ b/configs/sst_cs_bootloaders-gnu-efi.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: gnu-efi
   description: Development Libraries and headers for EFI
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-grub2.yaml b/configs/sst_cs_bootloaders-grub2.yaml
similarity index 89%
rename from configs/sst_desktop_firmware_bootloaders-grub2.yaml
rename to configs/sst_cs_bootloaders-grub2.yaml
index 78c1f8b1..efdb0bcc 100644
--- a/configs/sst_desktop_firmware_bootloaders-grub2.yaml
+++ b/configs/sst_cs_bootloaders-grub2.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: grub2
   description: Bootloader with support for Linux, Multiboot and more
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-grubby.yaml b/configs/sst_cs_bootloaders-grubby.yaml
similarity index 80%
rename from configs/sst_desktop_firmware_bootloaders-grubby.yaml
rename to configs/sst_cs_bootloaders-grubby.yaml
index df6c0e21..0ba73fb2 100644
--- a/configs/sst_desktop_firmware_bootloaders-grubby.yaml
+++ b/configs/sst_cs_bootloaders-grubby.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: grubby
   description: Command line tool for updating BootLoaderSpec files
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages:
     - grubby
   labels:
diff --git a/configs/sst_desktop_firmware_bootloaders-mokutil.yaml b/configs/sst_cs_bootloaders-mokutil.yaml
similarity index 83%
rename from configs/sst_desktop_firmware_bootloaders-mokutil.yaml
rename to configs/sst_cs_bootloaders-mokutil.yaml
index c958fc96..9b326e04 100644
--- a/configs/sst_desktop_firmware_bootloaders-mokutil.yaml
+++ b/configs/sst_cs_bootloaders-mokutil.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: mokutil
   description: Tool to manage UEFI Secure Boot MoK Keys
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-os-prober.yaml b/configs/sst_cs_bootloaders-os-prober.yaml
similarity index 86%
rename from configs/sst_desktop_firmware_bootloaders-os-prober.yaml
rename to configs/sst_cs_bootloaders-os-prober.yaml
index 84ea1d2f..cb4d5f67 100644
--- a/configs/sst_desktop_firmware_bootloaders-os-prober.yaml
+++ b/configs/sst_cs_bootloaders-os-prober.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: os-prober
   description: Probes disks on the system for installed operating systems
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-pesign.yaml b/configs/sst_cs_bootloaders-pesign.yaml
similarity index 83%
rename from configs/sst_desktop_firmware_bootloaders-pesign.yaml
rename to configs/sst_cs_bootloaders-pesign.yaml
index 966be9e8..a9ab58d6 100644
--- a/configs/sst_desktop_firmware_bootloaders-pesign.yaml
+++ b/configs/sst_cs_bootloaders-pesign.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: pesign
   description: Signing utility for UEFI binaries
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-shim.yaml b/configs/sst_cs_bootloaders-shim.yaml
similarity index 84%
rename from configs/sst_desktop_firmware_bootloaders-shim.yaml
rename to configs/sst_cs_bootloaders-shim.yaml
index 7d70297b..cb25a2cd 100644
--- a/configs/sst_desktop_firmware_bootloaders-shim.yaml
+++ b/configs/sst_cs_bootloaders-shim.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: shim
   description: First-stage UEFI bootloader
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-syslinux.yaml b/configs/sst_cs_bootloaders-syslinux.yaml
similarity index 84%
rename from configs/sst_desktop_firmware_bootloaders-syslinux.yaml
rename to configs/sst_cs_bootloaders-syslinux.yaml
index b3363954..18ef3755 100644
--- a/configs/sst_desktop_firmware_bootloaders-syslinux.yaml
+++ b/configs/sst_cs_bootloaders-syslinux.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: syslinux
   description: Simple kernel loader which boots from a FAT filesystem
-  maintainer: sst_desktop_firmware_bootloaders
+  maintainer: sst_cs_bootloaders
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_firmware_bootloaders-unwanted.yaml b/configs/sst_cs_bootloaders-unwanted.yaml
similarity index 52%
rename from configs/sst_desktop_firmware_bootloaders-unwanted.yaml
rename to configs/sst_cs_bootloaders-unwanted.yaml
index 8f07f0a4..7b17b69d 100644
--- a/configs/sst_desktop_firmware_bootloaders-unwanted.yaml
+++ b/configs/sst_cs_bootloaders-unwanted.yaml
@@ -1,9 +1,9 @@
 document: feedback-pipeline-unwanted
 version: 1
 data:
-  name: Desktop Firmware and Bootloaders - Blocked packages
-  description: Desktop Firmware and Bootloaders - Packages which should not be in ELN
-  maintainer: sst_desktop_firmware_bootloaders
+  name: Core Services Bootloaders - Blocked packages
+  description: Core Services Bootloaders - Packages which should not be in ELN
+  maintainer: sst_cs_bootloaders
   unwanted_source_packages:
     # Replaced by fwupd
     - fwupdate