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 e5c2aed435f..8d140db9b84 100644
--- a/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
+++ b/testsuite/features/build_validation/reposync/srv_sync_all_products.feature
@@ -667,6 +667,7 @@ Feature: Synchronize products in the products page of the Setup Wizard
     When I use spacewalk-common-channel to add all "rockylinux9" channels with arch "x86_64"
     And I wait until all synchronized channels for "rockylinux9" have finished
 
+@susemanager
 @ubuntu2004_minion
   Scenario: Add Ubuntu 20.04
     Given I am authorized for the "Admin" section
diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb
index 2e919eee44f..b7d348babb6 100644
--- a/testsuite/features/support/commonlib.rb
+++ b/testsuite/features/support/commonlib.rb
@@ -65,7 +65,7 @@ def product_version
 # @return [String, nil] The full product version if the command execution was successful and
 #   the output is not empty, otherwise nil.
 def product_version_full
-  cmd = 'salt-call --local grains.get product_version | tail -n 1'
+  cmd = 'venv-salt-call --local grains.get product_version | tail -n 1'
   out, code = get_target('server').run(cmd)
   out.strip if code.zero? && !out.nil?
 end
diff --git a/testsuite/features/support/constants.rb b/testsuite/features/support/constants.rb
index 6c436cf4f4a..a1bcb780ba2 100644
--- a/testsuite/features/support/constants.rb
+++ b/testsuite/features/support/constants.rb
@@ -444,8 +444,8 @@
     'Rocky Linux 8 (x86_64)' => 'rockylinux8-x86_64',
     'Rocky Linux 9 (x86_64)' => 'rockylinux9-x86_64',
     'Ubuntu 20.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2004-pool-amd64-uyuni',
-    'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-22.04-pool-amd64-uyuni',
-    'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-24.04-pool-amd64-uyuni',
+    'Ubuntu 22.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2204-pool-amd64-uyuni',
+    'Ubuntu 24.04 LTS AMD64 Base for Uyuni' => 'ubuntu-2404-pool-amd64-uyuni',
     'Debian 11 (bullseye) pool for amd64 for Uyuni' => 'debian-11-pool-amd64-uyuni',
     'Debian 12 (bookworm) pool for amd64 for Uyuni' => 'debian-12-pool-amd64-uyuni',
     'openSUSE Leap 15.5 (aarch64)' => 'opensuse_leap15_5-aarch64',
@@ -1314,7 +1314,7 @@
       ],
     'ubuntu-2204' => # CHECKED
       %w[
-        ubuntu-22.04-pool-amd64-uyuni
+        ubuntu-2204-pool-amd64-uyuni
         ubuntu-2204-amd64-main-security-uyuni
         ubuntu-2204-amd64-main-updates-uyuni
         ubuntu-2204-amd64-main-uyuni
@@ -1326,7 +1326,7 @@
       ],
     'ubuntu-2404' =>
       %w[
-        ubuntu-24.04-pool-amd64-uyuni
+        ubuntu-2404-pool-amd64-uyuni
         ubuntu-2404-amd64-main-security-uyuni
         ubuntu-2404-amd64-main-updates-uyuni
         ubuntu-2404-amd64-main-uyuni
@@ -1630,7 +1630,7 @@
   'ubuntu-2204-amd64-universe-updates-uyuni' => 240,
   'ubuntu-2204-amd64-universe-uyuni' => 24_000,
   'ubuntu-2204-amd64-uyuni-client-devel' => 60,
-  'ubuntu-22.04-pool-amd64-uyuni' => 60,
+  'ubuntu-2204-pool-amd64-uyuni' => 60,
   'ubuntu-22.04-suse-manager-tools-amd64' => 60,
   'ubuntu-2404-amd64-main-amd64' => 780,
   'ubuntu-2404-amd64-main-security-amd64' => 2760,
@@ -1643,7 +1643,7 @@
   'ubuntu-2404-amd64-universe-updates-uyuni' => 240,
   'ubuntu-2404-amd64-universe-uyuni' => 24_000,
   'ubuntu-2404-amd64-uyuni-client-devel' => 60,
-  'ubuntu-24.04-pool-amd64-uyuni' => 60,
+  'ubuntu-2404-pool-amd64-uyuni' => 60,
   'ubuntu-24.04-suse-manager-tools-amd64' => 60,
   'uyuni-proxy-devel-leap-x86_64' => 60
 }.freeze