diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml
index fddaaccbcc..127a514e3b 100644
--- a/ansible/roles/neutron/handlers/main.yml
+++ b/ansible/roles/neutron/handlers/main.yml
@@ -73,7 +73,7 @@
   with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
   when:
     - action != "config"
-    - enabled_nova_fake | bool
+    - enable_nova_fake | bool
     - neutron_plugin_agent == "openvswitch"
     - inventory_hostname in groups["compute"]
     - fake_config_json | changed
@@ -100,7 +100,7 @@
   with_sequence: "start=1 end={{ num_nova_fake_per_node }}"
   when:
     - action != "config"
-    - enabled_nova_fake | bool
+    - enable_nova_fake | bool
     - neutron_plugin_agent == "sfc"
     - inventory_hostname in groups["compute"]
     - fake_config_json | changed
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 606d7218cd..c54f8fcbc1 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -32,7 +32,7 @@ scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,ComputeFilter,Com
 {% if orchestration_engine == 'KUBERNETES' %}
 host = empty
 {% else %}
-host = {{ ansible_hostname }}_{{ item }}
+host = {{ ansible_hostname }}_{{ service_name }}
 {% endif %}
 compute_driver = fake.FakeDriver
 {% else %}