diff --git a/configs/sst_desktop-branding.yaml b/configs/sst_display_desktop_foundation-branding.yaml
similarity index 95%
rename from configs/sst_desktop-branding.yaml
rename to configs/sst_display_desktop_foundation-branding.yaml
index a0db3fcf4..1b706aad3 100644
--- a/configs/sst_desktop-branding.yaml
+++ b/configs/sst_display_desktop_foundation-branding.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Desktop branding
   description: RHEL branding
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop-brasero.yaml b/configs/sst_display_desktop_foundation-brasero.yaml
similarity index 91%
rename from configs/sst_desktop-brasero.yaml
rename to configs/sst_display_desktop_foundation-brasero.yaml
index f05c961b2..84b3e71c8 100644
--- a/configs/sst_desktop-brasero.yaml
+++ b/configs/sst_display_desktop_foundation-brasero.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Brasero
   description: Default physical media burner application in Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages: []
   arch_packages:
     ppc64le:
diff --git a/configs/sst_desktop-gnome-calculator.yaml b/configs/sst_display_desktop_foundation-gnome-calculator.yaml
similarity index 81%
rename from configs/sst_desktop-gnome-calculator.yaml
rename to configs/sst_display_desktop_foundation-gnome-calculator.yaml
index 8bccba92d..f832b378b 100644
--- a/configs/sst_desktop-gnome-calculator.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-calculator.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Calculator
   description: Calculator application for Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-calculator
   labels:
diff --git a/configs/sst_desktop-gnome-clocks.yaml b/configs/sst_display_desktop_foundation-gnome-clocks.yaml
similarity index 80%
rename from configs/sst_desktop-gnome-clocks.yaml
rename to configs/sst_display_desktop_foundation-gnome-clocks.yaml
index b407bd113..76ad2d555 100644
--- a/configs/sst_desktop-gnome-clocks.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-clocks.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Clocks
   description: Clocks application for Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-clocks
   labels:
diff --git a/configs/sst_desktop-gnome-desktop.yaml b/configs/sst_display_desktop_foundation-gnome-desktop.yaml
similarity index 91%
rename from configs/sst_desktop-gnome-desktop.yaml
rename to configs/sst_display_desktop_foundation-gnome-desktop.yaml
index 783d4c8e5..6fe1941eb 100644
--- a/configs/sst_desktop-gnome-desktop.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-desktop.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Desktop
   description: GNOME Desktop core packages
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - freerdp
     - gdm
diff --git a/configs/sst_desktop-gnome-disks.yaml b/configs/sst_display_desktop_foundation-gnome-disks.yaml
similarity index 82%
rename from configs/sst_desktop-gnome-disks.yaml
rename to configs/sst_display_desktop_foundation-gnome-disks.yaml
index d9c39edd9..f0dc062ce 100644
--- a/configs/sst_desktop-gnome-disks.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-disks.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Disks
   description: Default application for managing disks in Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-disk-utility
   labels:
diff --git a/configs/sst_desktop-gnome-font-viewer.yaml b/configs/sst_display_desktop_foundation-gnome-font-viewer.yaml
similarity index 82%
rename from configs/sst_desktop-gnome-font-viewer.yaml
rename to configs/sst_display_desktop_foundation-gnome-font-viewer.yaml
index 90d26c2f3..dbb782694 100644
--- a/configs/sst_desktop-gnome-font-viewer.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-font-viewer.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Font Viewer
   description: Application for viewing available fonts on Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-font-viewer
   labels:
diff --git a/configs/sst_desktop-gnome-initial-setup.yaml b/configs/sst_display_desktop_foundation-gnome-initial-setup.yaml
similarity index 81%
rename from configs/sst_desktop-gnome-initial-setup.yaml
rename to configs/sst_display_desktop_foundation-gnome-initial-setup.yaml
index bb2eba0bc..8fbfdaecd 100644
--- a/configs/sst_desktop-gnome-initial-setup.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-initial-setup.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Initial Setup
   description: Application to prepare a new system
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-initial-setup
   labels:
diff --git a/configs/sst_desktop-gnome-kiosk.yaml b/configs/sst_display_desktop_foundation-gnome-kiosk.yaml
similarity index 81%
rename from configs/sst_desktop-gnome-kiosk.yaml
rename to configs/sst_display_desktop_foundation-gnome-kiosk.yaml
index 083d03822..70768bc2d 100644
--- a/configs/sst_desktop-gnome-kiosk.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-kiosk.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: gnome-kiosk
   description: Window management and application launching for GNOME
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-kiosk
   labels:
diff --git a/configs/sst_desktop-gnome-system-monitor.yaml b/configs/sst_display_desktop_foundation-gnome-system-monitor.yaml
similarity index 82%
rename from configs/sst_desktop-gnome-system-monitor.yaml
rename to configs/sst_display_desktop_foundation-gnome-system-monitor.yaml
index d50267945..7b5d31e71 100644
--- a/configs/sst_desktop-gnome-system-monitor.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-system-monitor.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME System Monitor
   description: Default system monitor application for Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-system-monitor
   labels:
diff --git a/configs/sst_desktop-gnome-text-editor.yaml b/configs/sst_display_desktop_foundation-gnome-text-editor.yaml
similarity index 82%
rename from configs/sst_desktop-gnome-text-editor.yaml
rename to configs/sst_display_desktop_foundation-gnome-text-editor.yaml
index 72d5a15cf..d16c58f9e 100644
--- a/configs/sst_desktop-gnome-text-editor.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-text-editor.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Text Editor
   description: Text editor for Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-text-editor
     - gtksourceview5
diff --git a/configs/sst_desktop-gnome-tour.yaml b/configs/sst_display_desktop_foundation-gnome-tour.yaml
similarity index 79%
rename from configs/sst_desktop-gnome-tour.yaml
rename to configs/sst_display_desktop_foundation-gnome-tour.yaml
index 93161f047..c4c63eeae 100644
--- a/configs/sst_desktop-gnome-tour.yaml
+++ b/configs/sst_display_desktop_foundation-gnome-tour.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Tour
   description: GNOME Tour and Greeter
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gnome-tour
   labels:
diff --git a/configs/sst_desktop-gtk3.yaml b/configs/sst_display_desktop_foundation-gtk3.yaml
similarity index 85%
rename from configs/sst_desktop-gtk3.yaml
rename to configs/sst_display_desktop_foundation-gtk3.yaml
index 0dd28c25e..486bda57d 100644
--- a/configs/sst_desktop-gtk3.yaml
+++ b/configs/sst_display_desktop_foundation-gtk3.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GTK 3 toolkit
   description: Software toolkit for developing applications
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gtk-update-icon-cache
     - gtk3
diff --git a/configs/sst_desktop-gtk4.yaml b/configs/sst_display_desktop_foundation-gtk4.yaml
similarity index 82%
rename from configs/sst_desktop-gtk4.yaml
rename to configs/sst_display_desktop_foundation-gtk4.yaml
index f38fa5cbf..eedb6800d 100644
--- a/configs/sst_desktop-gtk4.yaml
+++ b/configs/sst_display_desktop_foundation-gtk4.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GTK 4 toolkit
   description: Software toolkit for developing applications
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - gtk4
     - gtk4-devel
diff --git a/configs/sst_desktop-plymouth.yaml b/configs/sst_display_desktop_foundation-plymouth.yaml
similarity index 92%
rename from configs/sst_desktop-plymouth.yaml
rename to configs/sst_display_desktop_foundation-plymouth.yaml
index c834ad4e4..e7218dfd0 100644
--- a/configs/sst_desktop-plymouth.yaml
+++ b/configs/sst_display_desktop_foundation-plymouth.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Plymouth
   description: Graphical boot animation and logger
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - plymouth
     - plymouth-core-libs
diff --git a/configs/sst_desktop-ptyxis.yaml b/configs/sst_display_desktop_foundation-ptyxis.yaml
similarity index 80%
rename from configs/sst_desktop-ptyxis.yaml
rename to configs/sst_display_desktop_foundation-ptyxis.yaml
index 8c577c884..74dff55b8 100644
--- a/configs/sst_desktop-ptyxis.yaml
+++ b/configs/sst_display_desktop_foundation-ptyxis.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Ptyxis
   description: Default terminal application in Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - ptyxis
   labels:
diff --git a/configs/sst_desktop-seahorse.yaml b/configs/sst_display_desktop_foundation-seahorse.yaml
similarity index 81%
rename from configs/sst_desktop-seahorse.yaml
rename to configs/sst_display_desktop_foundation-seahorse.yaml
index 24e1aadf8..6031b4848 100644
--- a/configs/sst_desktop-seahorse.yaml
+++ b/configs/sst_display_desktop_foundation-seahorse.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Seahorse
   description: A password and encryption key manager for Workstation
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - seahorse
   labels:
diff --git a/configs/sst_desktop-sysprof.yaml b/configs/sst_display_desktop_foundation-sysprof.yaml
similarity index 78%
rename from configs/sst_desktop-sysprof.yaml
rename to configs/sst_display_desktop_foundation-sysprof.yaml
index c8382db9c..51021ca79 100644
--- a/configs/sst_desktop-sysprof.yaml
+++ b/configs/sst_display_desktop_foundation-sysprof.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Sysprof
   description: System-wide profiling tool
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   packages:
     - sysprof
   labels:
diff --git a/configs/sst_desktop-unwanted.yaml b/configs/sst_display_desktop_foundation-unwanted.yaml
similarity index 98%
rename from configs/sst_desktop-unwanted.yaml
rename to configs/sst_display_desktop_foundation-unwanted.yaml
index 06594bcab..3e6429800 100644
--- a/configs/sst_desktop-unwanted.yaml
+++ b/configs/sst_display_desktop_foundation-unwanted.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Desktop - Blocked packages
   description: Desktop - Packages which should not be in ELN
-  maintainer: sst_desktop
+  maintainer: sst_display_desktop_foundation
   unwanted_source_packages:
     # RHEL 9 unwanted entries:
     # quvi is disabled as a dependency of Totem in RHEL
diff --git a/configs/sst_pt_gcc-unwanted.yaml b/configs/sst_pt_gcc-unwanted.yaml
index afeed4e59..96eb71b88 100644
--- a/configs/sst_pt_gcc-unwanted.yaml
+++ b/configs/sst_pt_gcc-unwanted.yaml
@@ -13,7 +13,7 @@ data:
     - cppcheck
     - cppcheck-gui
     - cppcheck-htmlreport
-    # Owned by sst_desktop
+    # Owned by sst_cs_software_management
     # - cppunit
     # - cppunit-devel
     # - cppunit-doc