diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index 8a21833fd..0fe5c05b7 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -67,6 +67,7 @@ ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
 extra_args: >-
    {%- if release not in ['train','ussuri','victoria'] -%}
    --disable-protected-resource-types
+   --baremetal-deployment
    {%- endif -%}
 
 # Tempest configuration, keep always at the end of the file
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 2f282b9d1..88c12f670 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -39,6 +39,7 @@ extra_args: >-
   -e {{ overcloud_templates_path }}/environments/services/neutron-ovs.yaml
   {% if release not in ['train','ussuri','victoria'] -%}
   --disable-protected-resource-types
+  --baremetal-deployment
   {%- endif -%}
 
 composable_roles: true
diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml
index 96e7d9109..ceb033f7c 100644
--- a/config/general_config/featureset037.yml
+++ b/config/general_config/featureset037.yml
@@ -95,4 +95,5 @@ ephemeral_heat_args: "{{ '--heat-type pod' if ephemeral_heat|bool else '' }}"
 extra_args: >-
    {%- if release not in ['train','ussuri','victoria'] -%}
    --disable-protected-resource-types
+   --baremetal-deployment
    {%- endif -%}