diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
index 8bda8f3e777..8857efd00a3 100644
--- a/robottelo/constants/__init__.py
+++ b/robottelo/constants/__init__.py
@@ -311,9 +311,9 @@ class Colored(Box):
     'kickstart': {
         'rhel6': 'Red Hat Enterprise Linux 6 Server (Kickstart)',
         'rhel7': 'Red Hat Enterprise Linux 7 Server (Kickstart)',
-        'rhel8': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
+        'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (Kickstart)',
         'rhel8_aps': 'Red Hat Enterprise Linux 8 for x86_64 - AppStream (Kickstart)',
-        'rhel9': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
+        'rhel9_bos': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS (Kickstart)',
         'rhel9_aps': 'Red Hat Enterprise Linux 9 for x86_64 - AppStream (Kickstart)',
     },
     'rhel8_bos': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS (RPMs)',
@@ -538,7 +538,7 @@ class Colored(Box):
             'id': 'rhel-8-for-x86_64-baseos-kickstart',
             'name': 'Red Hat Enterprise Linux 8 for x86_64 - BaseOS Kickstart 8.9',
             'version': '8.9',
-            'reposet': REPOSET['kickstart']['rhel8'],
+            'reposet': REPOSET['kickstart']['rhel8_bos'],
             'product': PRDS['rhel8'],
             'distro': 'rhel8',
         },
@@ -554,7 +554,7 @@ class Colored(Box):
             'id': 'rhel-9-for-x86_64-baseos-kickstart',
             'name': 'Red Hat Enterprise Linux 9 for x86_64 - BaseOS Kickstart 9.3',
             'version': '9.3',
-            'reposet': REPOSET['kickstart']['rhel9'],
+            'reposet': REPOSET['kickstart']['rhel9_bos'],
             'product': PRDS['rhel9'],
             'distro': 'rhel9',
         },
diff --git a/tests/foreman/api/test_repository.py b/tests/foreman/api/test_repository.py
index ea392f67c06..57a41d6950f 100644
--- a/tests/foreman/api/test_repository.py
+++ b/tests/foreman/api/test_repository.py
@@ -1121,7 +1121,7 @@ def test_module_stream_repository_crud_operations(self, repo):
         with pytest.raises(HTTPError):
             repo.read()
 
-    def test_positive_recreate_pulp_repositories(self, module_entitlement_manifest_org, target_sat):
+    def test_positive_recreate_pulp_repositories(self, module_sca_manifest_org, target_sat):
         """Verify that deleted Pulp Repositories can be recreated using the
         command 'foreman-rake katello:correct_repositories COMMIT=true'
 
@@ -1136,7 +1136,7 @@ def test_positive_recreate_pulp_repositories(self, module_entitlement_manifest_o
         """
         repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
             basearch='x86_64',
-            org_id=module_entitlement_manifest_org.id,
+            org_id=module_sca_manifest_org.id,
             product=constants.PRDS['rhel'],
             repo=constants.REPOS['rhst7']['name'],
             reposet=constants.REPOSET['rhst7'],
@@ -1475,9 +1475,7 @@ def test_positive_sync_repo_null_contents_changed(self, module_sca_manifest_org,
             if isinstance(ver, int)
         ],
     )
-    def test_positive_sync_kickstart_check_os(
-        self, module_entitlement_manifest_org, distro, target_sat
-    ):
+    def test_positive_sync_kickstart_check_os(self, module_sca_manifest_org, distro, target_sat):
         """Sync rhel KS repo and assert that OS was created
 
         :id: f84bcf1b-717e-40e7-82ee-000eead45249
@@ -1492,10 +1490,10 @@ def test_positive_sync_kickstart_check_os(
             1. OS with corresponding version was created.
 
         """
-        distro = f'rhel{distro} + "_bos"' if distro > 7 else f'rhel{distro}'
+        distro = f'rhel{distro}_bos' if distro > 7 else f'rhel{distro}'
         repo_id = target_sat.api_factory.enable_rhrepo_and_fetchid(
             basearch='x86_64',
-            org_id=module_entitlement_manifest_org.id,
+            org_id=module_sca_manifest_org.id,
             product=constants.REPOS['kickstart'][distro]['product'],
             reposet=constants.REPOSET['kickstart'][distro],
             repo=constants.REPOS['kickstart'][distro]['name'],
diff --git a/tests/foreman/ui/test_sync.py b/tests/foreman/ui/test_sync.py
index d4351bc4923..44cfc7483b8 100644
--- a/tests/foreman/ui/test_sync.py
+++ b/tests/foreman/ui/test_sync.py
@@ -40,7 +40,7 @@ def module_custom_product(module_org, module_target_sat):
 @pytest.mark.skip_if_not_set('fake_manifest')
 @pytest.mark.tier2
 @pytest.mark.upgrade
-def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest_org):
+def test_positive_sync_rh_repos(session, target_sat, module_sca_manifest_org):
     """Create Content RedHat Sync with two repos.
 
     :id: e30f6509-0b65-4bcc-a522-b4f3089d3911
@@ -57,7 +57,7 @@ def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest
         for distro, repo in zip(distros, repos, strict=True)
     ]
     for repo_collection in repo_collections:
-        repo_collection.setup(module_entitlement_manifest_org.id, synchronize=False)
+        repo_collection.setup(module_sca_manifest_org.id, synchronize=False)
     repo_paths = [
         (
             repo.repo_data['product'],
@@ -68,7 +68,7 @@ def test_positive_sync_rh_repos(session, target_sat, module_entitlement_manifest
         for repo in repos
     ]
     with session:
-        session.organization.select(org_name=module_entitlement_manifest_org.name)
+        session.organization.select(org_name=module_sca_manifest_org.name)
         results = session.sync_status.synchronize(repo_paths)
         assert len(results) == len(repo_paths)
         assert all([result == 'Syncing Complete.' for result in results])