diff --git a/testsuite/features/build_validation/reposync/srv_sync_all_products.feature b/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
index e711b4cc840c..559b8599efe3 100644
--- a/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
+++ b/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
@@ -21,6 +21,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server LTSS 12 SP4 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 12 SP4 x86_64" product has been added
+    And I wait until all synchronized channels for "sles12-sp4" have finished
 
 @sle12sp5_minion
   Scenario: Add SUSE Linux Enterprise Server 12 SP5
@@ -31,6 +32,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server 12 SP5 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 12 SP5 x86_64" product has been added
+    And I wait until all synchronized channels for "sles12-sp5" have finished
 
 @sle15sp1_minion
   Scenario: Add SUSE Linux Enterprise Server 15 SP1
@@ -44,6 +46,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "SUSE Linux Enterprise Server LTSS 15 SP1 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP1 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp1" have finished
 
 @sle15sp2_minion
   Scenario: Add SUSE Linux Enterprise Server 15 SP2
@@ -63,6 +66,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     Then I should see the "Development Tools Module 15 SP2 x86_64" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP2 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp2" have finished
 
 @sle15sp3_minion
   Scenario: Add SUSE Linux Enterprise Server 15 SP3
@@ -83,6 +87,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Server 15 SP3 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp3" have finished
 
 @sle15sp4_minion
   Scenario: Add SUSE Linux Enterprise Server 15 SP4
@@ -101,24 +106,26 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp4" have finished
 
 @sle15sp5_minion
-Scenario: Add SUSE Linux Enterprise Server 15 SP5
-  When I follow the left menu "Admin > Setup Wizard > Products"
-  And I wait until I do not see "Loading" text
-  And I enter "SUSE Linux Enterprise Server 15 SP5" as the filtered product description
-  And I select "SUSE Linux Enterprise Server 15 SP5 x86_64" as a product
-  Then I should see the "SUSE Linux Enterprise Server 15 SP5 x86_64" selected
-  When I open the sub-list of the product "SUSE Linux Enterprise Server 15 SP5 x86_64"
-  And I open the sub-list of the product "Basesystem Module 15 SP5 x86_64"
-  And I select "Desktop Applications Module 15 SP5 x86_64" as a product
-  Then I should see the "Desktop Applications Module 15 SP5 x86_64" selected
-  When I open the sub-list of the product "Desktop Applications Module 15 SP5 x86_64"
-  And I select "Development Tools Module 15 SP5 x86_64" as a product
-  Then I should see the "Development Tools Module 15 SP5 x86_64" selected
-  When I click the Add Product button
-  And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
-  And I wait until I see "SUSE Linux Enterprise Server 15 SP5 x86_64" product has been added
+  Scenario: Add SUSE Linux Enterprise Server 15 SP5
+    When I follow the left menu "Admin > Setup Wizard > Products"
+    And I wait until I do not see "Loading" text
+    And I enter "SUSE Linux Enterprise Server 15 SP5" as the filtered product description
+    And I select "SUSE Linux Enterprise Server 15 SP5 x86_64" as a product
+    Then I should see the "SUSE Linux Enterprise Server 15 SP5 x86_64" selected
+    When I open the sub-list of the product "SUSE Linux Enterprise Server 15 SP5 x86_64"
+    And I open the sub-list of the product "Basesystem Module 15 SP5 x86_64"
+    And I select "Desktop Applications Module 15 SP5 x86_64" as a product
+    Then I should see the "Desktop Applications Module 15 SP5 x86_64" selected
+    When I open the sub-list of the product "Desktop Applications Module 15 SP5 x86_64"
+    And I select "Development Tools Module 15 SP5 x86_64" as a product
+    Then I should see the "Development Tools Module 15 SP5 x86_64" selected
+    When I click the Add Product button
+    And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
+    And I wait until I see "SUSE Linux Enterprise Server 15 SP5 x86_64" product has been added
+    And I wait until all synchronized channels for "sles15-sp5" have finished
 
 @slemicro51_minion
   Scenario: Add SUSE Linux Enterprise Micro 5.1
@@ -133,6 +140,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.1 x86_64" product has been added
+    And I wait until all synchronized channels for "suse-microos-5.1" have finished
 
 @slemicro52_minion
   Scenario: Add SUSE Linux Enterprise Micro 5.2
@@ -147,6 +155,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.2 x86_64" product has been added
+    And I wait until all synchronized channels for "suse-microos-5.2" have finished
 
 @slemicro53_minion
   Scenario: Add SUSE Linux Enterprise Micro 5.3
@@ -161,6 +170,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.3 x86_64" product has been added
+    And I wait until all synchronized channels for "sle-micro-5.3" have finished
 
 @slemicro54_minion
   Scenario: Add SUSE Linux Enterprise Micro 5.4
@@ -175,6 +185,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Linux Enterprise Micro 5.4 x86_64" product has been added
+    And I wait until all synchronized channels for "sle-micro-5.4" have finished
 
 @opensuse154arm_minion
   Scenario: Add openSUSE 15.4 for ARM
@@ -186,6 +197,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "openSUSE Leap 15.4 aarch64" product has been added
+    And I wait until all synchronized channels for "leap15.4-aarch64" have finished
 
 @opensuse155arm_minion
   Scenario: Add openSUSE 15.5 for ARM
@@ -197,6 +209,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "openSUSE Leap 15.5 aarch64" product has been added
+    And I wait until all synchronized channels for "leap15.5-aarch64" have finished
 
 @alma9_minion
   Scenario: Add Alma Linux 9
@@ -207,6 +220,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "AlmaLinux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "AlmaLinux 9 x86_64" product has been added
+    And I wait until all synchronized channels for "almalinux9" have finished
 
 @centos7_minion
   Scenario: Add SUSE Linux Enterprise Server with Expanded Support 7
@@ -217,9 +231,10 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "SUSE Linux Enterprise Server with Expanded Support 7" selected
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server with Expanded Support 7" product has been added
+    And I wait until all synchronized channels for "res7" have finished
 
-@liberty9_minion
-  Scenario: Add Liberty Linux 9
+@rhel9_minion
+  Scenario: Add RHEL 9
     When I follow the left menu "Admin > Setup Wizard > Products"
     And I wait until I do not see "Loading" text
     And I enter "RHEL and Liberty 9 Base" as the filtered product description
@@ -227,11 +242,21 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "RHEL and Liberty 9 Base" selected
     When I click the Add Product button
     And I wait until I see "RHEL and Liberty 9 Base" product has been added
+    And I wait until all synchronized channels for "el9" have finished
+
+@liberty9_minion
+  Scenario: Add Liberty Linux 9
+    When I follow the left menu "Admin > Setup Wizard > Products"
+    And I wait until I do not see "Loading" text
+    And I enter "RHEL and Liberty 9 Base" as the filtered product description
+    And I select "RHEL and Liberty 9 Base" as a product
+    Then I should see the "RHEL and Liberty 9 Base" selected
     When I open the sub-list of the product "RHEL and Liberty 9 Base"
     And I select "SUSE Liberty Linux 9" as a product
     Then I should see the "SUSE Liberty Linux 9" selected
     When I click the Add Product button
     And I wait until I see "SUSE Liberty Linux 9" product has been added
+    And I wait until all synchronized channels for "sll-9" have finished
 
 @oracle9_minion
   Scenario: Add Oracle Linux 9
@@ -242,16 +267,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Oracle Linux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "Oracle Linux 9 x86_64" product has been added
-
-@rhel9_minion
-  Scenario: Add RHEL 9
-    When I follow the left menu "Admin > Setup Wizard > Products"
-    And I wait until I do not see "Loading" text
-    And I enter "RHEL and Liberty 9 Base" as the filtered product description
-    And I select "RHEL and Liberty 9 Base" as a product
-    Then I should see the "RHEL and Liberty 9 Base" selected
-    When I click the Add Product button
-    And I wait until I see "RHEL and Liberty 9 Base" product has been added
+    And I wait until all synchronized channels for "oraclelinux9" have finished
 
 @rocky8_minion
   Scenario: Add SUSE Linux Enterprise Server with Expanded Support 8
@@ -265,6 +281,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "SUSE Linux Enterprise Server with Expanded Support 8" selected
     When I click the Add Product button
     And I wait until I see "RHEL or SLES ES or CentOS 8 Base" product has been added
+    And I wait until all synchronized channels for "res8" have finished
 
 @rocky9_minion
   Scenario: Add Rocky Linux 9
@@ -275,6 +292,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Rocky Linux 9 x86_64" selected
     When I click the Add Product button
     And I wait until I see "Rocky Linux 9 x86_64" product has been added
+    And I wait until all synchronized channels for "rockylinux-9" have finished
 
 @ubuntu1804_minion
   Scenario: Add Ubuntu 18.04
@@ -295,6 +313,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Ubuntu 20.04" selected
     When I click the Add Product button
     And I wait until I see "Ubuntu 20.04" product has been added
+    And I wait until all synchronized channels for "ubuntu-2004" have finished
 
 @ubuntu2204_minion
   Scenario: Add Ubuntu 22.04
@@ -305,6 +324,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Ubuntu 22.04" selected
     When I click the Add Product button
     And I wait until I see "Ubuntu 22.04" product has been added
+   And I wait until all synchronized channels for "ubuntu-2204" have finished
 
 @debian10_minion
   Scenario: Add Debian 10
@@ -315,6 +335,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     Then I should see the "Debian 10" selected
     When I click the Add Product button
     And I wait until I see "Debian 10" product has been added
+    And I wait until all synchronized channels for "debian-10" have finished
 
 @debian11_minion
   Scenario: Add Debian 11
@@ -324,7 +345,8 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     And I select "Debian 11" as a product
     Then I should see the "Debian 11" selected
     When I click the Add Product button
-     And I wait until I see "Debian 11" product has been added
+    And I wait until I see "Debian 11" product has been added
+    And I wait until all synchronized channels for "debian-11" have finished
 
 @proxy
   Scenario: Add SUSE Manager Proxy 4.3
@@ -336,6 +358,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Proxy 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-proxy-43" have finished
 
 @proxy
   Scenario: Add SUSE Manager Retail Branch Server 4.3
@@ -347,6 +370,7 @@ Scenario: Add SUSE Linux Enterprise Server 15 SP5
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Retail Branch Server 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-retail-branch-server-43" have finished
 
   Scenario: Detect product loading issues from the UI in Build Validation
     When I follow the left menu "Admin > Setup Wizard > Products"
diff --git a/testsuite/features/reposync/srv_sync_products.feature b/testsuite/features/reposync/srv_sync_products.feature
index b9e45c7e4d73..b3d257d8e933 100644
--- a/testsuite/features/reposync/srv_sync_products.feature
+++ b/testsuite/features/reposync/srv_sync_products.feature
@@ -61,10 +61,12 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "SUSE Linux Enterprise Server 15 SP4 x86_64" product has been added
     Then the SLE15 SP4 product should be added
+    When I wait until all synchronized channels for "sles15-sp4" have finished
 
 @uyuni
   Scenario: Add openSUSE Leap 15.4 product, including Uyuni Client Tools
     When I use spacewalk-common-channel to add channel "opensuse_leap15_4 opensuse_leap15_4-non-oss opensuse_leap15_4-non-oss-updates opensuse_leap15_4-updates opensuse_leap15_4-backports-updates opensuse_leap15_4-sle-updates uyuni-proxy-devel-leap opensuse_leap15_4-uyuni-client" with arch "x86_64"
+    And I wait until all synchronized channels for "leap15.4-x86_64" have finished
 
 @proxy
 @susemanager
@@ -77,6 +79,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Proxy 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-proxy-43" have finished
 
 @proxy
 @susemanager
@@ -89,6 +92,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I click the Add Product button
     And I wait until I see "Selected channels/products were scheduled successfully for syncing." text
     And I wait until I see "SUSE Manager Retail Branch Server 4.3 x86_64" product has been added
+    And I wait until all synchronized channels for "suma-retail-branch-server-43" have finished
 
 @scc_credentials
 @susemanager
diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb
index 178d9921fb19..8f5f6f5a8e72 100644
--- a/testsuite/features/step_definitions/command_steps.rb
+++ b/testsuite/features/step_definitions/command_steps.rb
@@ -448,6 +448,13 @@
   end
 end
 
+When(/I wait until all synchronized channels for "([^"]*)" have finished$/) do |product_os_version|
+  CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION[product_os_version].each do |channel|
+    log "I wait until '#{channel}' synchronized channel has finished"
+    step %(I wait until the channel "#{channel}" has been synced)
+  end
+end
+
 When(/^I execute mgr\-bootstrap "([^"]*)"$/) do |arg1|
   $command_output, _code = get_target('server').run("mgr-bootstrap #{arg1}")
 end
diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb
index f25f6af13391..050c4bbdef43 100644
--- a/testsuite/features/support/commonlib.rb
+++ b/testsuite/features/support/commonlib.rb
@@ -32,9 +32,9 @@ def compute_channels_to_leave_running
   # keep the repos needed for the auto-installation tests
   do_not_kill =
     if product == 'Uyuni'
-      CHANNEL_TO_SYNCH_BY_OS_VERSION['15.4']
+      CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION['sles15-sp4']
     else
-      CHANNEL_TO_SYNCH_BY_OS_VERSION['default']
+      CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION['default']
     end
   [get_target('sle_minion'), get_target('build_host'), get_target('ssh_minion'), get_target('rhlike_minion')].each do |node|
     next unless node
@@ -42,9 +42,10 @@ def compute_channels_to_leave_running
     os_family = node.os_family
     next unless ['sles', 'rocky'].include?(os_family)
     os_version = os_version.split('.')[0] if os_family == 'rocky'
-    log 'Can\'t build list of reposyncs to leave running' unless %w[15-SP3 15-SP4 15.4 8].include? os_version
-    do_not_kill += CHANNEL_TO_SYNCH_BY_OS_VERSION[os_version]
+    log 'Can\'t build list of reposyncs to leave running' unless %w[sles15-sp3 sles15-sp4 leap15.4-x86_64 res8].include? os_version
+    do_not_kill += CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION[os_version]
   end
+  do_not_kill += CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION['fake'] unless $build_validation
   do_not_kill.uniq
 end
 
diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb
index 08a2375ff9b9..2b13ced80096 100644
--- a/testsuite/features/support/constants.rb
+++ b/testsuite/features/support/constants.rb
@@ -423,168 +423,335 @@
                       'opensuse155arm_minion' => 'aarch64',
                       'opensuse155arm_ssh_minion' => 'aarch64' }.freeze
 
-CHANNEL_TO_SYNCH_BY_OS_VERSION = {
+CHANNEL_TO_SYNCH_BY_OS_PRODUCT_VERSION = {
   # 'default' is required for auto-installation tests.
   'default' =>
-  %w[
-    sle-product-sles15-sp4-pool-x86_64
-    sle-manager-tools15-pool-x86_64-sp4
-    sle-manager-tools15-pool-x86_64-sled-sp4
-    sle-manager-tools15-beta-pool-x86_64-sp4
-    sle-module-containers15-sp4-pool-x86_64
-    sle-module-basesystem15-sp4-pool-x86_64
-    sle-module-server-applications15-sp4-pool-x86_64
-    sle-product-sles15-sp4-updates-x86_64
-    sle-manager-tools15-updates-x86_64-sp4
-    sle-manager-tools15-updates-x86_64-sled-sp4
-    sle-manager-tools15-beta-updates-x86_64-sp4
-    sle-module-containers15-sp4-updates-x86_64
-    sle-module-basesystem15-sp4-updates-x86_64
-    sle-module-server-applications15-sp4-updates-x86_64
-    sle15-sp4-installer-updates-x86_64
-    sle-module-desktop-applications15-sp4-pool-x86_64
-    sle-module-desktop-applications15-sp4-updates-x86_64
-    sle-module-devtools15-sp4-pool-x86_64
-    sle-module-devtools15-sp4-updates-x86_64
-    sle-module-containers15-sp4-pool-x86_64
-    sle-module-containers15-sp4-updates-x86_64
-  ],
-  '15-SP3' =>
-  %w[
-    sle-product-sles15-sp3-pool-x86_64
-    sle-manager-tools15-pool-x86_64-sp3
-    sle-manager-tools15-pool-x86_64-sled-sp3
-    sle-manager-tools15-beta-pool-x86_64-sp3
-    sle-module-containers15-sp3-pool-x86_64
-    sle-module-basesystem15-sp3-pool-x86_64
-    sle-module-server-applications15-sp3-pool-x86_64
-    sle-product-sles15-sp3-updates-x86_64
-    sle-manager-tools15-updates-x86_64-sp3
-    sle-manager-tools15-updates-x86_64-sled-sp3
-    sle-manager-tools15-beta-updates-x86_64-sp3
-    sle-module-containers15-sp3-updates-x86_64
-    sle-module-basesystem15-sp3-updates-x86_64
-    sle-module-server-applications15-sp3-updates-x86_64
-    sle15-sp3-installer-updates-x86_64
-    sle-module-desktop-applications15-sp3-pool-x86_64
-    sle-module-desktop-applications15-sp3-updates-x86_64
-    sle-module-devtools15-sp3-pool-x86_64
-    sle-module-devtools15-sp3-updates-x86_64
-    sle-module-containers15-sp3-pool-x86_64
-    sle-module-containers15-sp3-updates-x86_64
-  ],
-  '15-SP4' =>
-  %w[
-    sle-product-sles15-sp4-pool-x86_64
-    sle-manager-tools15-pool-x86_64-sp4
-    sle-manager-tools15-pool-x86_64-sled-sp4
-    sle-manager-tools15-beta-pool-x86_64-sp4
-    sle-module-containers15-sp4-pool-x86_64
-    sle-module-basesystem15-sp4-pool-x86_64
-    sle-module-server-applications15-sp4-pool-x86_64
-    sle-product-sles15-sp4-updates-x86_64
-    sle-manager-tools15-updates-x86_64-sp4
-    sle-manager-tools15-updates-x86_64-sled-sp4
-    sle-manager-tools15-beta-updates-x86_64-sp4
-    sle-module-containers15-sp4-updates-x86_64
-    sle-module-basesystem15-sp4-updates-x86_64
-    sle-module-server-applications15-sp4-updates-x86_64
-    sle15-sp4-installer-updates-x86_64
-    sle-module-desktop-applications15-sp4-pool-x86_64
-    sle-module-desktop-applications15-sp4-updates-x86_64
-    sle-module-devtools15-sp4-pool-x86_64
-    sle-module-devtools15-sp4-updates-x86_64
-    sle-module-containers15-sp4-pool-x86_64
-    sle-module-containers15-sp4-updates-x86_64
-    sle-module-suse-manager-proxy-4.3-pool-x86_64
-    sle-module-suse-manager-proxy-4.3-updates-x86_64
-    sle-module-server-applications15-sp4-pool-x86_64-proxy-4.3
-    sle-module-server-applications15-sp4-updates-x86_64-proxy-4.3
-    sle-module-basesystem15-sp4-pool-x86_64-proxy-4.3
-    sle-module-basesystem15-sp4-updates-x86_64-proxy-4.3
-    sle-product-suse-manager-proxy-4.3-pool-x86_64
-    sle-product-suse-manager-proxy-4.3-updates-x86_64
-    sle-product-suse-manager-retail-branch-server-4.3-pool-x86_64
-    sle-product-suse-manager-retail-branch-server-4.3-updates-x86_64
-    sle-module-suse-manager-retail-branch-server-4.3-pool-x86_64
-    sle-module-suse-manager-retail-branch-server-4.3-updates-x86_64
-    sle-module-basesystem15-sp4-pool-x86_64-smrbs-4.3
-    sle-module-basesystem15-sp4-updates-x86_64-smrbs-4.3
-    sle-module-suse-manager-proxy-4.3-pool-x86_64-smrbs
-    sle-module-suse-manager-proxy-4.3-updates-x86_64-smrbs
-    sle-module-server-applications15-sp4-updates-x86_64-smrbs-4.3
-  ],
-  '8' =>
-  %w[
-    res8-manager-tools-pool-x86_64
-    res8-manager-tools-updates-x86_64
-    sll8-uyuni-client-x86_64
-  ],
-  '15.4' =>
-  %w[
-    opensuse_leap15_4-x86_64
-    opensuse_leap15_4-x86_64-non-oss
-    opensuse_leap15_4-x86_64-non-oss-updates
-    opensuse_leap15_4-x86_64-updates
-    opensuse_leap15_4-x86_64-backports-updates
-    opensuse_leap15_4-x86_64-sle-updates
-    uyuni-proxy-devel-leap-x86_64
-    opensuse_leap15_4-uyuni-client-x86_64
-  ]
-}.freeze
-
-OS_REPOS_BY_OS_VERSION = {
-  '11-SP4' =>
-  %w[
-    SLE-Module-Basesystem11-SP4-Pool
-    SLE-Module-Basesystem11-SP4-Updates
-    SLE-Module-Containers11-SP4-Pool
-    SLE-Module-Containers11-SP4-Updates
-  ],
-  '12-SP3' =>
-  %w[
-    SLE-Module-Basesystem12-SP3-Pool
-    SLE-Module-Basesystem12-SP3-Updates
-  ],
-  '12-SP4' =>
-  %w[
-    SLE-Module-Basesystem12-SP4-Pool
-    SLE-Module-Basesystem12-SP4-Updates
-  ],
-  '15-SP1' =>
-  %w[
-    SLE-Module-Basesystem15-SP1-Pool
-    SLE-Module-Basesystem15-SP1-Updates
-    SLE-Module-DevTools15-SP1-Pool
-    SLE-Module-DevTools15-SP1-Updates
-    SLE-Module-Desktop-Applications15-SP1-Pool
-    SLE-Module-Desktop-Applications15-SP1-Updates
-  ],
-  '15-SP2' =>
-  %w[
-    SLE-Module-Basesystem15-SP2-Pool
-    SLE-Module-Basesystem15-SP2-Updates
-    SLE-Module-DevTools15-SP2-Pool
-    SLE-Module-DevTools15-SP2-Updates
-    SLE-Module-Desktop-Applications15-SP2-Pool
-    SLE-Module-Desktop-Applications15-SP2-Updates
-  ],
-  '15-SP3' =>
-  %w[
-    SLE-Module-Basesystem15-SP3-Pool
-    SLE-Module-Basesystem15-SP3-Updates
-    SLE-Module-DevTools15-SP3-Pool
-    SLE-Module-DevTools15-SP3-Updates
-    SLE-Module-Desktop-Applications15-SP3-Pool
-    SLE-Module-Desktop-Applications15-SP3-Updates
-  ],
-  '15-SP4' =>
-  %w[
-    SLE-Module-Basesystem15-SP4-Pool
-    SLE-Module-Basesystem15-SP4-Updates
-    SLE-Module-DevTools15-SP4-Pool
-    SLE-Module-DevTools15-SP4-Updates
-    SLE-Module-Desktop-Applications15-SP4-Pool
-    SLE-Module-Desktop-Applications15-SP4-Updates
-  ]
+    %w[
+      sle-product-sles15-sp4-pool-x86_64
+      sle-manager-tools15-pool-x86_64-sp4
+      sle-manager-tools15-pool-x86_64-sled-sp4
+      sle-manager-tools15-beta-pool-x86_64-sp4
+      sle-module-containers15-sp4-pool-x86_64
+      sle-module-basesystem15-sp4-pool-x86_64
+      sle-module-server-applications15-sp4-pool-x86_64
+      sle-product-sles15-sp4-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp4
+      sle-manager-tools15-updates-x86_64-sled-sp4
+      sle-manager-tools15-beta-updates-x86_64-sp4
+      sle-module-containers15-sp4-updates-x86_64
+      sle-module-basesystem15-sp4-updates-x86_64
+      sle-module-server-applications15-sp4-updates-x86_64
+      sle15-sp4-installer-updates-x86_64
+      sle-module-desktop-applications15-sp4-pool-x86_64
+      sle-module-desktop-applications15-sp4-updates-x86_64
+      sle-module-devtools15-sp4-pool-x86_64
+      sle-module-devtools15-sp4-updates-x86_64
+      sle-module-containers15-sp4-pool-x86_64
+      sle-module-containers15-sp4-updates-x86_64
+    ],
+  'almalinux9' =>
+    %w[
+      almalinux9-appstream-x86_64
+      almalinux9-x86_64
+    ],
+  'debian-10' =>
+    %w[
+      debian-10-main-security-amd64
+      debian-10-main-updates-amd64
+      debian-10-pool-amd64
+      debian-10-suse-manager-tools-amd64
+      devel-debian-10-client-tools
+    ],
+  'debian-11' =>
+    %w[
+      debian-11-main-security-amd64
+      debian-11-main-updates-amd64
+      debian-11-pool-amd64
+      debian-11-suse-manager-tools-amd64
+      devel-debian-11-client-tools
+    ],
+  'sll-9' =>
+    %w[
+      sll-9-updates-x86_64
+      sll-as-9-updates-x86_64
+      sll-cb-9-updates-x86_64
+    ],
+  'el9' =>
+    %w[
+      el9-manager-tools-pool-x86_64-alma
+      el9-manager-tools-pool-x86_64
+      el9-manager-tools-pool-x86_64-ol9
+      el9-manager-tools-pool-x86_64-rocky
+      el9-manager-tools-updates-x86_64-alma
+      el9-manager-tools-updates-x86_64
+      el9-manager-tools-updates-x86_64-ol9
+      el9-manager-tools-updates-x86_64-rocky
+      el9-pool-x86_64
+    ],
+  'rockylinux-8' =>
+    %w[
+      rockylinux-8-appstream-x86_64
+      rockylinux-8-x86_64
+    ],
+  'rockylinux-9' =>
+    %w[
+      rockylinux-9-appstream-x86_64
+      rockylinux-9-x86_64
+    ],
+  'oraclelinux9' =>
+    %w[
+      oraclelinux9-appstream-x86_64
+      oraclelinux9-x86_64
+    ],
+  'sles12-sp4' =>
+    %w[
+      sles12-sp4-installer-updates-x86_64
+      sles12-sp4-ltss-updates-x86_64
+      sles12-sp4-pool-x86_64
+      sles12-sp4-updates-x86_64
+      sle-manager-tools12-updates-x86_64-sp4
+      sle-manager-tools12-pool-x86_64-sp4
+    ],
+  'sles12-sp5' =>
+    %w[
+      sles12-sp5-installer-updates-x86_64
+      sles12-sp5-pool-x86_64
+      sles12-sp5-updates-x86_64
+      sle-manager-tools12-updates-x86_64-sp5
+      sle-manager-tools12-pool-x86_64-sp5
+    ],
+  'sles15-sp1' =>
+    %w[
+      sle-product-sles15-sp1-ltss-updates-x86_64
+      sle-product-sles15-sp1-pool-x86_64
+      sle-product-sles15-sp1-updates-x86_64
+      sle-module-server-applications15-sp1-pool-x86_64
+      sle-module-server-applications15-sp1-updates-x86_64
+      sle-module-basesystem15-sp1-pool-x86_64
+      sle-module-basesystem15-sp1-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp1
+      sle-manager-tools15-pool-x86_64-sp1
+      sle15-sp1-installer-updates-x86_64
+    ],
+  'sles15-sp2' =>
+    %w[
+      sle-product-sles15-sp2-ltss-updates-x86_64
+      sle-product-sles15-sp2-pool-x86_64
+      sle-product-sles15-sp2-updates-x86_64
+      sle-module-server-applications15-sp2-pool-x86_64
+      sle-module-server-applications15-sp2-updates-x86_64
+      sle-module-devtools15-sp2-pool-x86_64
+      sle-module-devtools15-sp2-updates-x86_64
+      sle-module-desktop-applications15-sp2-pool-x86_64
+      sle-module-desktop-applications15-sp2-updates-x86_64
+      sle-module-basesystem15-sp2-pool-x86_64
+      sle-module-basesystem15-sp2-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp2
+      sle-manager-tools15-pool-x86_64-sp2
+      sle15-sp2-installer-updates-x86_64
+    ],
+  'sles15-sp3' =>
+    %w[
+      sle-product-sles15-sp3-ltss-updates-x86_64
+      sle-product-sles15-sp3-pool-x86_64
+      sle-manager-tools15-pool-x86_64-sp3
+      sle-manager-tools15-pool-x86_64-sled-sp3
+      sle-manager-tools15-beta-pool-x86_64-sp3
+      sle-module-containers15-sp3-pool-x86_64
+      sle-module-basesystem15-sp3-pool-x86_64
+      sle-module-server-applications15-sp3-pool-x86_64
+      sle-product-sles15-sp3-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp3
+      sle-manager-tools15-updates-x86_64-sled-sp3
+      sle-manager-tools15-beta-updates-x86_64-sp3
+      sle-module-containers15-sp3-updates-x86_64
+      sle-module-basesystem15-sp3-updates-x86_64
+      sle-module-server-applications15-sp3-updates-x86_64
+      sle15-sp3-installer-updates-x86_64
+      sle-module-desktop-applications15-sp3-pool-x86_64
+      sle-module-desktop-applications15-sp3-updates-x86_64
+      sle-module-devtools15-sp3-pool-x86_64
+      sle-module-devtools15-sp3-updates-x86_64
+      sle-module-containers15-sp3-pool-x86_64
+      sle-module-containers15-sp3-updates-x86_64
+    ],
+  'sles15-sp4' =>
+    %w[
+      sle-product-sles15-sp4-pool-x86_64
+      sle-manager-tools15-pool-x86_64-sp4
+      sle-manager-tools15-pool-x86_64-sled-sp4
+      sle-manager-tools15-beta-pool-x86_64-sp4
+      sle-module-containers15-sp4-pool-x86_64
+      sle-module-basesystem15-sp4-pool-x86_64
+      sle-module-server-applications15-sp4-pool-x86_64
+      sle-product-sles15-sp4-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp4
+      sle-manager-tools15-updates-x86_64-sled-sp4
+      sle-manager-tools15-beta-updates-x86_64-sp4
+      sle-module-containers15-sp4-updates-x86_64
+      sle-module-basesystem15-sp4-updates-x86_64
+      sle-module-server-applications15-sp4-updates-x86_64
+      sle15-sp4-installer-updates-x86_64
+      sle-module-desktop-applications15-sp4-pool-x86_64
+      sle-module-desktop-applications15-sp4-updates-x86_64
+      sle-module-devtools15-sp4-pool-x86_64
+      sle-module-devtools15-sp4-updates-x86_64
+      sle-module-containers15-sp4-pool-x86_64
+      sle-module-containers15-sp4-updates-x86_64
+      sle-module-suse-manager-proxy-4.3-pool-x86_64
+      sle-module-suse-manager-proxy-4.3-updates-x86_64
+      sle-module-server-applications15-sp4-pool-x86_64-proxy-4.3
+      sle-module-server-applications15-sp4-updates-x86_64-proxy-4.3
+      sle-module-basesystem15-sp4-pool-x86_64-proxy-4.3
+      sle-module-basesystem15-sp4-updates-x86_64-proxy-4.3
+      sle-product-suse-manager-proxy-4.3-pool-x86_64
+      sle-product-suse-manager-proxy-4.3-updates-x86_64
+      sle-product-suse-manager-retail-branch-server-4.3-pool-x86_64
+      sle-product-suse-manager-retail-branch-server-4.3-updates-x86_64
+      sle-module-suse-manager-retail-branch-server-4.3-pool-x86_64
+      sle-module-suse-manager-retail-branch-server-4.3-updates-x86_64
+      sle-module-basesystem15-sp4-pool-x86_64-smrbs-4.3
+      sle-module-basesystem15-sp4-updates-x86_64-smrbs-4.3
+      sle-module-suse-manager-proxy-4.3-pool-x86_64-smrbs
+      sle-module-suse-manager-proxy-4.3-updates-x86_64-smrbs
+      sle-module-server-applications15-sp4-updates-x86_64-smrbs-4.3
+    ],
+  'sles15-sp5' =>
+    %w[
+      sle-product-sles15-sp5-pool-x86_64
+      sle-product-sles15-sp5-updates-x86_64
+      sle-module-server-applications15-sp5-pool-x86_64
+      sle-module-server-applications15-sp5-updates-x86_64
+      sle-module-devtools15-sp5-pool-x86_64
+      sle-module-devtools15-sp5-updates-x86_64
+      sle-module-desktop-applications15-sp5-pool-x86_64
+      sle-module-desktop-applications15-sp5-updates-x86_64
+      sle-module-basesystem15-sp5-pool-x86_64
+      sle-module-basesystem15-sp5-updates-x86_64
+      sle-manager-tools15-updates-x86_64-sp5
+      sle-manager-tools15-pool-x86_64-sp5
+      sle15-sp5-installer-updates-x86_64
+      ],
+  'res7' =>
+    %w[
+      rhel-x86_64-server-7
+      res7-suse-manager-tools-x86_64
+      res7-x86_64
+    ],
+  'res8' =>
+    %w[
+      rhel8-pool-x86_64
+      res-8-updates-x86_64
+      res-as-8-updates-x86_64
+      res-cb-8-updates-x86_64
+      res8-manager-tools-pool-x86_64
+      res8-manager-tools-updates-x86_64
+      sll8-uyuni-client-x86_64
+    ],
+  'leap15.4-x86_64' =>
+    %w[
+      opensuse_leap15_4-x86_64
+      opensuse_leap15_4-x86_64-non-oss
+      opensuse_leap15_4-x86_64-non-oss-updates
+      opensuse_leap15_4-x86_64-updates
+      opensuse_leap15_4-x86_64-backports-updates
+      opensuse_leap15_4-x86_64-sle-updates
+      uyuni-proxy-devel-leap-x86_64
+      opensuse_leap15_4-uyuni-client-x86_64
+      sle-15-sp4-updates-aarch64-opensuse-15.4
+    ],
+  'leap15.4-aarch64' =>
+    %w[
+      opensuse-backports-15.4-updates-aarch64
+      opensuse-leap-15.4-pool-aarch64
+      opensuse-leap-15.4-updates-aarch64
+      sle-manager-tools15-updates-aarch64-opensuse-15.4
+      sle-manager-tools15-pool-aarch64-opensuse-15.4
+    ],
+  'leap15.5-aarch64' =>
+    %w[
+      opensuse-backports-15.5-updates-aarch64
+      opensuse-leap-15.5-pool-aarch64
+      opensuse-leap-15.5-updates-aarch64
+      opensuse-sle-15.5-updates-aarch64
+      sle-manager-tools15-updates-aarch64-opensuse-15.5
+      sle-manager-tools15-pool-aarch64-opensuse-15.5
+    ],
+  'suse-microos-5.1' =>
+    %w[
+      suse-microos-5.1-pool-x86_64
+      suse-microos-5.1-updates-x86_64
+      sle-manager-tools-for-micro5-updates-x86_64-5.1
+      sle-manager-tools-for-micro5-pool-x86_64-5.1
+      sle-manager-tools-beta-for-micro5-updates-x86_64-5.1
+      sle-manager-tools-beta-for-micro5-pool-x86_64-5.1
+    ],
+  'suse-microos-5.2' =>
+    %w[
+      suse-microos-5.2-pool-x86_64
+      suse-microos-5.2-updates-x86_64
+      sle-manager-tools-for-micro5-updates-x86_64-5.2
+      sle-manager-tools-for-micro5-pool-x86_64-5.2
+      sle-manager-tools-beta-for-micro5-updates-x86_64-5.2
+      sle-manager-tools-beta-for-micro5-pool-x86_64-5.2
+    ],
+  'sle-micro-5.3' =>
+    %w[
+      sle-micro-5.3-pool-x86_64
+      sle-micro-5.3-updates-x86_64
+      sle-manager-tools-for-micro5-updates-x86_64-5.3
+      sle-manager-tools-for-micro5-pool-x86_64-5.3
+      sle-manager-tools-beta-for-micro5-updates-x86_64-5.3
+      sle-manager-tools-beta-for-micro5-pool-x86_64-5.3
+    ],
+  'sle-micro-5.4' =>
+    %w[
+      sle-micro-5.4-pool-x86_64
+      sle-micro-5.4-updates-x86_64
+      sle-manager-tools-for-micro5-updates-x86_64-5.4
+      sle-manager-tools-for-micro5-pool-x86_64-5.4
+      sle-manager-tools-beta-for-micro5-updates-x86_64-5.4
+      sle-manager-tools-beta-for-micro5-pool-x86_64-5.4
+    ],
+  'ubuntu-2004' =>
+    %w[
+      ubuntu-2004-amd64-main-amd64
+      ubuntu-2004-amd64-main-security-amd64
+      ubuntu-2004-amd64-main-updates-amd64
+      ubuntu-20.04-suse-manager-tools-amd64
+    ],
+  'ubuntu-2204' =>
+    %w[
+      ubuntu-2204-amd64-main-amd64
+      ubuntu-2204-amd64-main-security-amd64
+      ubuntu-2204-amd64-main-updates-amd64
+      ubuntu-22.04-suse-manager-tools-amd64
+    ],
+  'fake' =>
+    %w[
+      fake_base_channel
+      fake_child_channel
+      fake-i586-channel
+      fake-i586-channel-child-channel
+      test-channel-x86_64
+      test-channel-x86_64-child-channel
+      fake-deb-amd64-channel
+      fake-rh-like-channel
+    ],
+  'suma-proxy-43' =>
+    %w[
+      sle-product-suse-manager-proxy-4.3-pool-x86_64
+      sle-product-suse-manager-proxy-4.3-updates-x86_64
+      sle-module-suse-manager-proxy-4.3-pool-x86_64
+      sle-module-suse-manager-proxy-4.3-pool-x86_64-smrbs
+      sle-module-suse-manager-proxy-4.3-updates-x86_64
+      sle-module-suse-manager-proxy-4.3-updates-x86_64-smrbs
+    ],
+  'suma-retail-branch-server-43' =>
+    %w[
+      sle-product-suse-manager-retail-branch-server-4.3-pool-x86_64
+      sle-product-suse-manager-retail-branch-server-4.3-updates-x86_64
+      sle-module-suse-manager-retail-branch-server-4.3-pool-x86_64
+      sle-module-suse-manager-retail-branch-server-4.3-updates-x86_64
+    ]
 }.freeze