diff --git a/_review/README.md b/_review/README.md
index d4c80e8..225f1a2 100644
--- a/_review/README.md
+++ b/_review/README.md
@@ -9,11 +9,18 @@ This directory contains example configuration files for `openqa-revtui`
 
 Find a selection of templates for the qe-c squad (containers and images)
 
+**Recommended review configuration file**: [qe-Maintenance-QEC.toml](qe-Maintenance-QEC.toml) (contains all maintenance test runs except *LATEST*)
+
+Individual files:
+
 * [qec-publiccloud.toml](qec-publiccloud.toml) - Review template for SLES PublicCloud test runs
-* [qec-containers.toml](qec-containers.toml) - Review template for SLES container test runs (including BCI)
+* [qec-containers.toml](qec-containers.toml) - Review template for SLES container test runs (excluding BCI)
+* [qec-bci.toml](qec-bci.toml) - Review template for SLE BCI container images
 * [qec-jeos.toml](qec-jeos.toml) - Review template for SLE JeOS images
 * [qec-sle-micro.toml](qec-sle-micro.toml) - Review template for SLE Micro
 * [qec-sle-wsl.toml](qec-sle-wsl.toml) - Review template for SLE WSL images
+* [qec-wicked.toml](qec-wicked.toml) - Review template for wicked images
+* [qec-alp.toml](qec-alp.toml) - Review template for ALP (Dolomite)
 
 ## Create a TODO template
 
diff --git a/_review/qe-Maintenance-QEC.toml b/_review/qe-Maintenance-QEC.toml
new file mode 100644
index 0000000..95808b3
--- /dev/null
+++ b/_review/qe-Maintenance-QEC.toml
@@ -0,0 +1,288 @@
+## Review template file for ALP test runs on OSD
+
+Instance = "https://openqa.suse.de"              # openQA instance to query
+RabbitMQ = "amqps://suse:suse@rabbit.suse.de"    # RabbitMQ instance to query
+RabbitMQTopic = "suse.openqa.job.done"           # RabbitMQ topic to query
+HideStatus = ["scheduled", "passed", "softfailed", "cancelled", "skipped", "running", "uploading", "parallel_failed", "reviewed", "user_cancelled"]  # Hide jobs in defined states
+RefreshInterval = 60                             # Refresh from API once every minute
+MaxJobs = 20                                     # Max. job per group to display
+GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
+
+## BCI and Base images #########################################################
+
+[[Groups]]
+Name = "BCI Base Images 15-SP5"
+Params = { groupid = "475", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Base Images 15-SP4"
+Params = { groupid = "443", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Base Images 15-SP3"
+Params = { groupid = "442", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Language Images"
+Params = { groupid = "444", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Application Images"
+Params = { groupid = "445", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Base Images (pre-BCI, <15SP3)"
+Params = { groupid = "453", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SUMA images"
+Params = { groupid = "516", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI repo"
+Params = { groupid = "428", build = "" }
+MaxLifetime = 86400
+
+
+## Container Maintenance updates ###############################################
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15-SP5"
+Params = { groupid = "417", build = "%yesterday%-1", version="15-SP5" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15-SP4"
+Params = { groupid = "417", build = "%yesterday%-1", version="15-SP4" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15-SP3"
+Params = { groupid = "417", build = "%yesterday%-1", version="15-SP3" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15-SP2"
+Params = { groupid = "417", build = "%yesterday%-1", version="15-SP2" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15-SP1"
+Params = { groupid = "417", build = "%yesterday%-1", version="15-SP1" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 15"
+Params = { groupid = "417", build = "%yesterday%-1", version="15" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Containers Maintenance Updates 12-SP5"
+Params = { groupid = "417", build = "%yesterday%-1", version="12-SP5" }
+MaxLifetime = 86400
+
+# Create host disk images
+
+[[Groups]]
+Name = "Create bootable host HDDs"
+Params = { groupid = "377", build = "" }
+MaxLifetime = 86400
+
+
+## JeOS/MinimalVM Maintenance updates ##########################################
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 15-SP5"
+Params = { groupid = "419", build = "%yesterday%-1", version = "15-SP5" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 15-SP4"
+Params = { groupid = "419", build = "%yesterday%-1", version = "15-SP4" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 15-SP3"
+Params = { groupid = "419", build = "%yesterday%-1", version = "15-SP3" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 15-SP2"
+Params = { groupid = "419", build = "%yesterday%-1", version = "15-SP2" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 15-SP1"
+Params = { groupid = "419", build = "%yesterday%-1", version = "15-SP1" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "JeOS Maintenance Updates 12-SP5"
+Params = { groupid = "419", build = "%yesterday%-1", version = "12-SP5" }
+MaxLifetime = 86400
+
+
+## PublicCloud Maintenance updates #############################################
+
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 15-SP5"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP5" }
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 15-SP4"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP4" }
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 15-SP3"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP3" }
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 15-SP2"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP2" }
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 15-SP1"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP1" }
+[[Groups]]
+Name = "PublicCloud Maintenance Updates 12-SP5"
+Params = { groupid = "427", build = "%yesterday%-1", version="12-SP5" }
+
+# Create openQA helper instance disk image
+
+[[Groups]]
+Name = "Create publiccloud-tools HDD"
+Params = { groupid = "276", build = "" }
+MaxLifetime = 86400
+
+## SLE Micro image updates
+
+[[Groups]]
+Name = "SLE Micro Toolbox updates"
+Params = { groupid = "451" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro for Rancher"
+Params = { groupid = "449" }
+MaxLifetime = 86400
+
+
+## SLE Micro Maintenance updates ###############################################
+
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.5"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.5" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.4"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.4" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.3"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.3" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.2"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.2" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.1"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.1" }
+MaxLifetime = 86400
+
+## Single Incidents
+
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.5"
+Params = { groupid = "528" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.4"
+Params = { groupid = "486" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.3"
+Params = { groupid = "484" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.2"
+Params = { groupid = "483" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.1"
+Params = { groupid = "482" }
+MaxLifetime = 86400
+
+
+## Wicked Maintenance Updates ##################################################
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP5"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP5" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP4"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP4" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP3"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP3" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP2"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP2" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP1"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP1" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 12-SP5"
+Params = { groupid = "412", build = "%yesterday%-1", version="12-SP5" }
+MaxLifetime = 86400
+
+
+## WSL builds ##################################################################
+
+[[Groups]]
+Name = "SLE 15-SP5 WSL"
+Params = { groupid = "461" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE 15-SP4 WSL"
+Params = { groupid = "386" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SLE 15-SP3 WSL"
+Params = { groupid = "288" }
+MaxLifetime = 86400
+
+## Windows KVM Installation
+
+[[Groups]]
+Name = "Windows 11 installation"
+Params = { version="11", groupid="287" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Windows 10 installation"
+Params = { version="10", groupid="287" }
+MaxLifetime = 86400
diff --git a/_review/qe-core-O3.toml b/_review/qe-core-O3.toml
index 0ade17b..aa9300b 100644
--- a/_review/qe-core-O3.toml
+++ b/_review/qe-core-O3.toml
@@ -19,17 +19,17 @@ MaxLifetime = 86400
 # Leap 15.4
 
 [[Groups]]
-Name = "openSUSE Leap 15.4 Updates"
-Params = { groupid = "98", build = "" }
+Name = "openSUSE Leap 15.5 Updates"
+Params = { groupid = "112", build = "" }
 MaxLifetime = 86400
 
 [[Groups]]
-Name = "openSUSE Leap 15.4 Incidents"
-Params = { groupid = "97", build = "" }
+Name = "openSUSE Leap 15.5 Incidents"
+Params = { groupid = "114", build = "" }
 MaxLifetime = 86400
 
 [[Groups]]
-Name = "openSUSE Leap 15.4 Backports"
-Params = { groupid = "99", build = "" }
+Name = "openSUSE Leap 15.5 Backports"
+Params = { groupid = "113", build = "" }
 MaxLifetime = 86400
 
diff --git a/_review/qec-alp.toml b/_review/qec-alp.toml
index 4a58bb2..3e1db0e 100644
--- a/_review/qec-alp.toml
+++ b/_review/qec-alp.toml
@@ -9,8 +9,8 @@ MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 
 
-## Latest JeOS images
+## Latest ALP (Dolomite) Container Host
 [[Groups]]
-Name = "ALP Container host"
+Name = "ALP Dolomite Container host"
 Params = { groupid = "499" }
 MaxLifetime = 172800   # Review images upt to two days
diff --git a/_review/qec-bci.toml b/_review/qec-bci.toml
new file mode 100644
index 0000000..4de382b
--- /dev/null
+++ b/_review/qec-bci.toml
@@ -0,0 +1,50 @@
+## Review template file for container test runs on OSD
+
+Instance = "https://openqa.suse.de"              # openQA instance to query
+RabbitMQ = "amqps://suse:suse@rabbit.suse.de"    # RabbitMQ instance to query
+RabbitMQTopic = "suse.openqa.job.done"           # RabbitMQ topic to query
+HideStatus = ["scheduled", "passed", "softfailed", "cancelled", "skipped", "running", "uploading", "parallel_failed", "reviewed", "user_cancelled"]  # Hide jobs in defined states
+RefreshInterval = 60                             # Refresh from API once every minute
+MaxJobs = 20                                     # Max. job per group to display
+GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
+
+## BCI and Base images
+[[Groups]]
+Name = "BCI Base Images 15-SP5"
+Params = { groupid = "475", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Base Images 15-SP4"
+Params = { groupid = "443", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Base Images 15-SP3"
+Params = { groupid = "442", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Language Images"
+Params = { groupid = "444", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI Application Images"
+Params = { groupid = "445", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Base Images (pre-BCI, <15SP3)"
+Params = { groupid = "453", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "SUMA images"
+Params = { groupid = "516", build = "" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "BCI repo"
+Params = { groupid = "428", build = "" }
+MaxLifetime = 86400
diff --git a/_review/qec-containers.toml b/_review/qec-containers.toml
index aabe96e..e9a24db 100644
--- a/_review/qec-containers.toml
+++ b/_review/qec-containers.toml
@@ -8,42 +8,6 @@ RefreshInterval = 60                             # Refresh from API once every m
 MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 
-## BCI and Base images
-[[Groups]]
-Name = "Containers/BCI Base Images 15-SP5"
-Params = { groupid = "475", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/BCI Base Images 15-SP4"
-Params = { groupid = "443", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/BCI Base Images 15-SP3"
-Params = { groupid = "442", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/BCI Language Images"
-Params = { groupid = "444", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/BCI Application Images"
-Params = { groupid = "445", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/Base Images (pre-BCI, <15SP3)"
-Params = { groupid = "453", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Containers/BCI repo"
-Params = { groupid = "428", build = "" }
-MaxLifetime = 86400
-
 
 ## Maintenance updates
 
@@ -81,3 +45,10 @@ MaxLifetime = 86400
 Name = "Containers Maintenance Updates 12-SP5"
 Params = { groupid = "417", build = "%yesterday%-1", version="12-SP5" }
 MaxLifetime = 86400
+
+# Create host disk images
+
+[[Groups]]
+Name = "Create bootable host HDDs"
+Params = { groupid = "377", build = "" }
+MaxLifetime = 86400
diff --git a/_review/qec-jeos.toml b/_review/qec-jeos.toml
index d937125..3d1740c 100644
--- a/_review/qec-jeos.toml
+++ b/_review/qec-jeos.toml
@@ -8,13 +8,6 @@ RefreshInterval = 60                             # Refresh from API once every m
 MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 
-
-## Latest JeOS images
-[[Groups]]
-Name = "Lastest JeOS"
-Params = { groupid = "131" }
-MaxLifetime = 86400
-
 ## Maintenance updates
 
 [[Groups]]
diff --git a/_review/qec-publiccloud.toml b/_review/qec-publiccloud.toml
index 86cd971..14f0115 100644
--- a/_review/qec-publiccloud.toml
+++ b/_review/qec-publiccloud.toml
@@ -10,86 +10,32 @@ MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 DefaultParams = { distri = "sle" }               # Set of default parameters
 
-# Incidents
-[[Groups]]
-Name = "Public Cloud Incident test runs"
-Params = { groupid = "430" }
-MaxLifetime = 86400
 
-# Define publiccloud aggregate runs based on their Flavor
+## Maintenance updates
 
 [[Groups]]
-Name = "AZURE-Basic-Updates"
-Params = { flavor = "AZURE-Basic-Updates", build = "%yesterday%-1" }
-[[Groups]]
-Name = "AZURE-CHOST-BYOS-Updates"
-Params = { flavor = "AZURE-CHOST-BYOS-Updates", build = "%yesterday%-1" }
-[[Groups]]
-Name = "AZURE-Standard-Updates"
-Params = { flavor = "AZURE-Standard-Updates", build = "%yesterday%-1" }
-[[Groups]]
-Name = "AZURE-BYOS-Updates"
-Params = { flavor = "AZURE-BYOS-Updates", build = "%yesterday%-1" }
-[[Groups]]
-Name = "EC2-BYOS-Updates"
-Params = { flavor = "EC2-BYOS-Updates", build = "%yesterday%-1" }
-[[Groups]]
-Name = "EC2-CHOST-BYOS-Updates"
-Params = { flavor = "EC2-CHOST-BYOS-Updates", build = "%yesterday%-1" }
+Name = "PublicCloud Maintenance Updates 15-SP5"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP5" }
 [[Groups]]
-Name = "EC2-Updates"
-Params = { flavor = "EC2-Updates", build = "%yesterday%-1" }
+Name = "PublicCloud Maintenance Updates 15-SP4"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP4" }
 [[Groups]]
-Name = "GCE-Updates"
-Params = { flavor = "GCE-Updates", build = "%yesterday%-1" }
+Name = "PublicCloud Maintenance Updates 15-SP3"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP3" }
 [[Groups]]
-Name = "GCE-BYOS-Updates"
-Params = { flavor = "GCE-BYOS-Updates", build = "%yesterday%-1" }
+Name = "PublicCloud Maintenance Updates 15-SP2"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP2" }
 [[Groups]]
-Name = "GCE-CHOST-BYOS-Updates"
-Params = { flavor = "GCE-CHOST-BYOS-Updates", build = "%yesterday%-1" }
+Name = "PublicCloud Maintenance Updates 15-SP1"
+Params = { groupid = "427", build = "%yesterday%-1", version="15-SP1" }
 [[Groups]]
-Name = "Public Cloud clients"
-Params = { flavor = "Server-DVD-Updates", build = "%yesterday%-1", groupid = "427" }
-
-# Latest
-
-[[Groups]]
-Name = "Azure - Latest"
-Params = { groupid = "219", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "GCE - Latest"
-Params = { groupid = "275", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "EC2 - Latest"
-Params = { groupid = "274", build = "" }
-MaxLifetime = 86400
-
-# Staging 
-
-[[Groups]]
-Name = "Staging - Azure"
-Params = { groupid = "463", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Staging - GCE"
-Params = { groupid = "465", build = "" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "Staging - EC2"
-Params = { groupid = "464", build = "" }
-MaxLifetime = 86400
+Name = "PublicCloud Maintenance Updates 12-SP5"
+Params = { groupid = "427", build = "%yesterday%-1", version="12-SP5" }
 
-# Create HDD
+# Create openQA helper instance disk image
 
 [[Groups]]
-Name = "Create HDD"
+Name = "Create publiccloud-tools HDD"
 Params = { groupid = "276", build = "" }
 MaxLifetime = 86400
 
diff --git a/_review/qec-sle-micro-pc.toml b/_review/qec-sle-micro-pc.toml
deleted file mode 100644
index c83551e..0000000
--- a/_review/qec-sle-micro-pc.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-## Review template file for SLE micro test runs on OSD
-
-Instance = "https://openqa.suse.de"              # openQA instance to query
-RabbitMQ = "amqps://suse:suse@rabbit.suse.de"    # RabbitMQ instance to query
-RabbitMQTopic = "suse.openqa.job.done"           # RabbitMQ topic to query
-HideStatus = [ "scheduled", "passed", "softfailed", "running", "reviewed", "user_cancelled"]  # Hide jobs in defined states
-RefreshInterval = 60                             # Refresh from API once every minute
-MaxJobs = 20                                     # Max. job per group to display
-GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
-
-## SLEM on Public Cloud
-[[Groups]]
-Name = "SLEM 5.5 on Public Cloud"
-Params = { groupid = "523" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "SLEM 5.4 on Public Cloud"
-Params = { groupid = "480" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "SLEM 5.3 on Public Cloud"
-Params = { groupid = "455" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "SLEM 5.2 on Public Cloud"
-Params = { groupid = "413" }
-MaxLifetime = 86400
-
-[[Groups]]
-Name = "SLEM 5.1 on Public Cloud"
-Params = { groupid = "479" }
-MaxLifetime = 86400
-
diff --git a/_review/qec-sle-micro.toml b/_review/qec-sle-micro.toml
index ec2a19e..2840685 100644
--- a/_review/qec-sle-micro.toml
+++ b/_review/qec-sle-micro.toml
@@ -9,12 +9,7 @@ MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 
 
-## Latest SLE Micro images
-
-[[Groups]]
-Name = "Latest SLE Micro Container Host"
-Params = { groupid = "513" }
-MaxLifetime = 86400
+## SLE Micro image updates
 
 [[Groups]]
 Name = "SLE Micro Toolbox updates"
@@ -28,9 +23,14 @@ MaxLifetime = 86400
 
 ## Maintenance updates
 
+[[Groups]]
+Name = "SLE Micro Maintenance Updates 5.5"
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.5" }
+MaxLifetime = 86400
+
 [[Groups]]
 Name = "SLE Micro Maintenance Updates 5.4"
-Params = { groupid = "420", build = "%yesterday%-1", version = "5.3" }
+Params = { groupid = "420", build = "%yesterday%-1", version = "5.4" }
 MaxLifetime = 86400
 
 [[Groups]]
@@ -50,6 +50,11 @@ MaxLifetime = 86400
 
 ## Single Incidents
 
+[[Groups]]
+Name = "SLE Micro Maintenance Incidents for 5.5"
+Params = { groupid = "528" }
+MaxLifetime = 86400
+
 [[Groups]]
 Name = "SLE Micro Maintenance Incidents for 5.4"
 Params = { groupid = "486" }
diff --git a/_review/qec-sle-wicked.toml b/_review/qec-sle-wicked.toml
index 757dd78..1cf6dc1 100644
--- a/_review/qec-sle-wicked.toml
+++ b/_review/qec-sle-wicked.toml
@@ -10,7 +10,33 @@ GroupBy = "groups"                               # Group by defined groups ("non
 
 
 ## Wicked Maintenance Updates
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP5"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP5" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP4"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP4" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP3"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP3" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP2"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP2" }
+MaxLifetime = 86400
+
+[[Groups]]
+Name = "Wicked Maintenance Updates 15-SP1"
+Params = { groupid = "412", build = "%yesterday%-1", version="15-SP1" }
+MaxLifetime = 86400
+
 [[Groups]]
-Name = "Wicked Maintenance Updates"
-Params = { groupid = "412" }
+Name = "Wicked Maintenance Updates 12-SP5"
+Params = { groupid = "412", build = "%yesterday%-1", version="12-SP5" }
 MaxLifetime = 86400
diff --git a/_review/qec-sle-wsl.toml b/_review/qec-sle-wsl.toml
index a4fbb6a..41c6160 100644
--- a/_review/qec-sle-wsl.toml
+++ b/_review/qec-sle-wsl.toml
@@ -9,7 +9,8 @@ MaxJobs = 20                                     # Max. job per group to display
 GroupBy = "groups"                               # Group by defined groups ("none" or "groups")
 
 
-## Latest WSL builds
+## WSL builds
+
 [[Groups]]
 Name = "SLE 15-SP5 WSL"
 Params = { groupid = "461" }
@@ -22,11 +23,12 @@ MaxLifetime = 86400
 
 [[Groups]]
 Name = "SLE 15-SP3 WSL"
-Params = { groupid = "326" }
+Params = { groupid = "288" }
 MaxLifetime = 86400
 
 
 ## Windows KVM Installation
+
 [[Groups]]
 Name = "Windows 11 installation"
 Params = { version="11", groupid="287" }