diff --git a/pytest_fixtures/component/activationkey.py b/pytest_fixtures/component/activationkey.py
index 0e0166f2bf..e4dc47cd9e 100644
--- a/pytest_fixtures/component/activationkey.py
+++ b/pytest_fixtures/component/activationkey.py
@@ -26,9 +26,8 @@ def function_activation_key(function_sca_manifest_org, target_sat):
 
 
 @pytest.fixture(scope='module')
-def module_ak(module_lce, module_org, module_target_sat):
+def module_ak(module_org, module_target_sat):
     return module_target_sat.api.ActivationKey(
-        environment=module_lce,
         organization=module_org,
     ).create()
 
diff --git a/robottelo/host_helpers/api_factory.py b/robottelo/host_helpers/api_factory.py
index b1feb836a1..6659bf5312 100644
--- a/robottelo/host_helpers/api_factory.py
+++ b/robottelo/host_helpers/api_factory.py
@@ -608,19 +608,21 @@ def register_host_and_needed_setup(
             # updated entities after promoting
             entities = {k: v.read() for k, v in entities.items()}
 
+        updates = []
         if (  # assign env to ak if not present
             entities['ActivationKey'].environment is None
             or entities['ActivationKey'].environment.id != entities['LifecycleEnvironment'].id
         ):
             entities['ActivationKey'].environment = entities['LifecycleEnvironment']
-            entities['ActivationKey'].update(['environment'])
-            entities = {k: v.read() for k, v in entities.items()}
+            updates.append('environment')
         if (  # assign cv to ak if not present
             entities['ActivationKey'].content_view is None
             or entities['ActivationKey'].content_view.id != entities['ContentView'].id
         ):
             entities['ActivationKey'].content_view = entities['ContentView']
-            entities['ActivationKey'].update(['content_view'])
+            updates.append('content_view')
+        if updates:
+            entities['ActivationKey'].update(['content_view', 'environment'])  # both needed anyway
 
         entities = {k: v.read() for k, v in entities.items()}
         if enable_repos: