diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
index 5f2720e8c97e70db9cbf7a9ccb0c8683555090d9..3653a6032a69e706290d31bb06ffd03e27cef247 100644
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml
@@ -9,7 +9,7 @@
 
 - name: Copying over config.json files for services
   template:
-    src: "roles/neutron/templates/neutron-openvswitch-agent.json.j2"
+    src: "neutron-openvswitch-agent.json.j2"
     dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/config.json"
   with_sequence: start=1 end={{ num_nova_fake_per_node }}
   when:
diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml
index f7fdf959a6f44188cbe697326468da1f5aa9fc73..3d6dfc3638f77f2ed6f7471deac1968201a134af 100644
--- a/ansible/roles/nova/tasks/ceph.yml
+++ b/ansible/roles/nova/tasks/ceph.yml
@@ -48,7 +48,7 @@
 
 - name: Pushing secrets xml for libvirt
   template:
-    src: roles/nova/templates/secret.xml.j2
+    src: "secret.xml.j2"
     dest: "{{ node_config_directory }}/nova-libvirt/secrets/{{ rbd_secret_uuid }}.xml"
     mode: "0600"
   when: inventory_hostname in groups['compute']
diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml
index 9992932ac433babb1358e76c242747e462b2837e..77311b74d04c58320c7b24d232dd23ebca144ca3 100644
--- a/ansible/roles/nova/tasks/config-nova-fake.yml
+++ b/ansible/roles/nova/tasks/config-nova-fake.yml
@@ -8,7 +8,7 @@
 
 - name: Copying over config.json files for services
   template:
-    src: "roles/nova/templates/nova-compute.json.j2"
+    src: "nova-compute.json.j2"
     dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/config.json"
   with_sequence: start=1 end={{ num_nova_fake_per_node }}
 
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index b082d1bc4e790a2d1ca13eea8b6489079786d364..468eb568241ab1d751f7edba8b1f463931d19feb 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -72,5 +72,5 @@
 
 - name: Copying over libvirtd.conf
   template:
-    src: "{{ role_path }}/templates/libvirtd.conf.j2"
+    src: "libvirtd.conf.j2"
     dest: "{{ node_config_directory }}/nova-libvirt/libvirtd.conf"