diff --git a/roles/overcloud-deploy/templates/config-download.yaml.j2 b/roles/overcloud-deploy/templates/config-download.yaml.j2
index 211a7dbce..f01a5fe86 100644
--- a/roles/overcloud-deploy/templates/config-download.yaml.j2
+++ b/roles/overcloud-deploy/templates/config-download.yaml.j2
@@ -18,6 +18,11 @@ parameter_defaults:
 {% if release not in ['train', 'ussuri', 'victoria'] %}
   NovaLibvirtNumPciePorts: 12
 {% endif %}
+# Set machine type if default is not supported on current OS
+# see https://bugzilla.redhat.com/show_bug.cgi?id=2110535
+{% if nova_hw_machine_type is defined and nova_hw_machine_type %}
+  NovaHWMachineType: {{ nova_hw_machine_type }}
+{% endif %}
 
   DeployedServerPortMap:
 {% for subnode in groups['overcloud'] %}
diff --git a/roles/standalone/templates/standalone_config.yaml.j2 b/roles/standalone/templates/standalone_config.yaml.j2
index 8f1adb996..8c67cdc48 100644
--- a/roles/standalone/templates/standalone_config.yaml.j2
+++ b/roles/standalone/templates/standalone_config.yaml.j2
@@ -35,6 +35,11 @@ parameter_defaults:
   MasqueradeNetworks:
     {{ standalone_network }}.0/{{ standalone_network_prefix }}:
     - {{ standalone_network }}.0/{{ standalone_network_prefix }}
+# Set machine type if default is not supported on current OS
+# see https://bugzilla.redhat.com/show_bug.cgi?id=2110535
+{% if nova_hw_machine_type is defined and nova_hw_machine_type %}
+  NovaHWMachineType: {{ nova_hw_machine_type }}
+{% endif %}
   NeutronPublicInterface: {{ standalone_interface }}
 {% if standalone_neutron_bridge_mappings is defined and standalone_neutron_bridge_mappings %}
   NeutronBridgeMappings: {{ standalone_neutron_bridge_mappings }}