diff --git a/pytest_fixtures/core/sat_cap_factory.py b/pytest_fixtures/core/sat_cap_factory.py
index ba245ee3493..41679c64d5d 100644
--- a/pytest_fixtures/core/sat_cap_factory.py
+++ b/pytest_fixtures/core/sat_cap_factory.py
@@ -295,7 +295,7 @@ def parametrized_enrolled_sat(
 def get_deploy_args(request):
     """Get deploy arguments for Satellite base OS deployment. Should not be used for Capsule."""
     rhel_version = get_sat_rhel_version()
-    deploy_args = settings.content_host[f'rhel{rhel_version.major}'].vm | {
+    deploy_args = settings.server.deploy_arguments | {
         'deploy_rhel_version': rhel_version.base_version,
         'deploy_network_type': 'ipv6' if settings.server.is_ipv6 else 'ipv4',
         'deploy_flavor': settings.flavors.default,
@@ -306,7 +306,16 @@ def get_deploy_args(request):
             deploy_args.update(request.param)
         else:
             deploy_args['deploy_rhel_version'] = request.param
-    return deploy_args
+    return _remove_raw_keys(deploy_args)
+
+
+def _remove_raw_keys(param):
+    """Recursively remove all keys that start with "raw_" which may break converting to json"""
+    if isinstance(param, list):
+        return [_remove_raw_keys(item) for item in param]
+    if isinstance(param, dict):
+        return {k: (_remove_raw_keys(param[k])) for k in param if not k.startswith("raw_")}
+    return param
 
 
 @pytest.fixture