diff --git a/configs/sst_desktop_platform_technologies-bolt.yaml b/configs/sst_display_hardware_multimedia-bolt.yaml
similarity index 80%
rename from configs/sst_desktop_platform_technologies-bolt.yaml
rename to configs/sst_display_hardware_multimedia-bolt.yaml
index 904862b73..d332896b4 100644
--- a/configs/sst_desktop_platform_technologies-bolt.yaml
+++ b/configs/sst_display_hardware_multimedia-bolt.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: bolt
   description: System daemon to manage Thunderbolt devices
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_hardware_multimedia
   packages:
     - bolt
     - python3-dbusmock
diff --git a/configs/sst_desktop_platform_technologies-intel-lpmd.yaml b/configs/sst_display_hardware_multimedia-intel-lpmd.yaml
similarity index 81%
rename from configs/sst_desktop_platform_technologies-intel-lpmd.yaml
rename to configs/sst_display_hardware_multimedia-intel-lpmd.yaml
index dcc42e69f..c00539ebf 100644
--- a/configs/sst_desktop_platform_technologies-intel-lpmd.yaml
+++ b/configs/sst_display_hardware_multimedia-intel-lpmd.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: intel-lpmd
   description: Intel Low Power Mode Daemon
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_hardware_multimedia 
   packages: []
   labels:
     - eln
diff --git a/configs/sst_display_hardware-libcamera.yaml b/configs/sst_display_hardware_multimedia-libcamera.yaml
similarity index 100%
rename from configs/sst_display_hardware-libcamera.yaml
rename to configs/sst_display_hardware_multimedia-libcamera.yaml
diff --git a/configs/sst_desktop_platform_technologies-thermald.yaml b/configs/sst_display_hardware_multimedia-thermald.yaml
similarity index 80%
rename from configs/sst_desktop_platform_technologies-thermald.yaml
rename to configs/sst_display_hardware_multimedia-thermald.yaml
index 3c38f32df..c84a80822 100644
--- a/configs/sst_desktop_platform_technologies-thermald.yaml
+++ b/configs/sst_display_hardware_multimedia-thermald.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: thermald
   description: Thermal Management daemon
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_hardware_multimedia 
   packages: []
   labels:
     - eln
diff --git a/configs/sst_desktop_platform_technologies-unwanted.yaml b/configs/sst_display_hardware_multimedia-unwanted.yaml
similarity index 88%
rename from configs/sst_desktop_platform_technologies-unwanted.yaml
rename to configs/sst_display_hardware_multimedia-unwanted.yaml
index f44ea873c..af82904dd 100644
--- a/configs/sst_desktop_platform_technologies-unwanted.yaml
+++ b/configs/sst_display_hardware_multimedia-unwanted.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Desktop Platform Technologies - Blocked packages
   description: Desktop Platform Technologies - Packages which should not be in ELN
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_hardware_multimedia 
   unwanted_source_packages:
     - atf
     - lutok
diff --git a/configs/sst_desktop_platform_technologies-gnome-classic-session.yaml b/configs/sst_display_window_management-gnome-classic-session.yaml
similarity index 94%
rename from configs/sst_desktop_platform_technologies-gnome-classic-session.yaml
rename to configs/sst_display_window_management-gnome-classic-session.yaml
index cfcbdf036..43e36cef6 100644
--- a/configs/sst_desktop_platform_technologies-gnome-classic-session.yaml
+++ b/configs/sst_display_window_management-gnome-classic-session.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Classic session
   description: GNOME Classic session
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_window_management
   packages:
     - gnome-classic-session
     - gnome-shell-extension-apps-menu
diff --git a/configs/sst_desktop_platform_technologies-gnome-desktop.yaml b/configs/sst_display_window_management-gnome-desktop.yaml
similarity index 95%
rename from configs/sst_desktop_platform_technologies-gnome-desktop.yaml
rename to configs/sst_display_window_management-gnome-desktop.yaml
index 042df7790..d935ae612 100644
--- a/configs/sst_desktop_platform_technologies-gnome-desktop.yaml
+++ b/configs/sst_display_window_management-gnome-desktop.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: GNOME Desktop
   description: GNOME Desktop core packages
-  maintainer: sst_desktop_platform_technologies
+  maintainer: sst_display_window_management
   packages:
     - gnome-browser-connector
     - gnome-color-manager
diff --git a/configs/sst_display_desktop_foundation-gnome-kiosk.yaml b/configs/sst_display_window_management-gnome-kiosk.yaml
similarity index 81%
rename from configs/sst_display_desktop_foundation-gnome-kiosk.yaml
rename to configs/sst_display_window_management-gnome-kiosk.yaml
index 70768bc2d..aefe63936 100644
--- a/configs/sst_display_desktop_foundation-gnome-kiosk.yaml
+++ b/configs/sst_display_window_management-gnome-kiosk.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: gnome-kiosk
   description: Window management and application launching for GNOME
-  maintainer: sst_display_desktop_foundation
+  maintainer: sst_display_window_management
   packages:
     - gnome-kiosk
   labels: