diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml
index a5d205a835..f670a5b78d 100644
--- a/ansible/roles/horizon/tasks/reconfigure.yml
+++ b/ansible/roles/horizon/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "deploy.yml"
+- include_tasks: deploy.yml
diff --git a/ansible/roles/mongodb/handlers/main.yml b/ansible/roles/mongodb/handlers/main.yml
index 4a8d1421c5..60b1159382 100644
--- a/ansible/roles/mongodb/handlers/main.yml
+++ b/ansible/roles/mongodb/handlers/main.yml
@@ -31,5 +31,5 @@
   run_once: True
 
 - name: Bootstrap cluster
-  include_tasks: "bootstrap_cluster.yml"
+  include_tasks: bootstrap_cluster.yml
   when: mongodb_replication_status.stdout != "1"
diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml
index c67afde709..dc78269cc1 100644
--- a/ansible/roles/nova-cell/tasks/config.yml
+++ b/ansible/roles/nova-cell/tasks/config.yml
@@ -92,7 +92,7 @@
     - Restart nova-libvirt container
 
 - name: Copying over libvirt TLS keys (nova-libvirt)
-  include_tasks: "config-libvirt-tls.yml"
+  include_tasks: config-libvirt-tls.yml
   vars:
     service: "{{ nova_cell_services['nova-libvirt'] }}"
     service_name: nova-libvirt
@@ -110,7 +110,7 @@
     - clientkey.pem
 
 - name: Copying over libvirt TLS keys (nova-compute)
-  include_tasks: "config-libvirt-tls.yml"
+  include_tasks: config-libvirt-tls.yml
   vars:
     service: "{{ nova_cell_services['nova-compute'] }}"
     service_name: nova-compute
diff --git a/ansible/roles/nova-hyperv/tasks/reconfigure.yml b/ansible/roles/nova-hyperv/tasks/reconfigure.yml
index a5d205a835..f670a5b78d 100644
--- a/ansible/roles/nova-hyperv/tasks/reconfigure.yml
+++ b/ansible/roles/nova-hyperv/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "deploy.yml"
+- include_tasks: deploy.yml
diff --git a/ansible/roles/octavia/tasks/deploy.yml b/ansible/roles/octavia/tasks/deploy.yml
index 00466c7850..ca35957343 100644
--- a/ansible/roles/octavia/tasks/deploy.yml
+++ b/ansible/roles/octavia/tasks/deploy.yml
@@ -1,14 +1,14 @@
 ---
-- include_tasks: "register.yml"
+- include_tasks: register.yml
   when: inventory_hostname in groups['octavia-api']
 
-- include_tasks: "config.yml"
+- include_tasks: config.yml
   when: inventory_hostname in groups['octavia-api'] or
         inventory_hostname in groups['octavia-health-manager'] or
         inventory_hostname in groups['octavia-housekeeping'] or
         inventory_hostname in groups['octavia-worker']
 
-- include_tasks: "bootstrap.yml"
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['octavia-api']
 
 - name: Flush handlers
diff --git a/ansible/roles/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml
index 2d4777ab57..20ccddc8f1 100644
--- a/ansible/roles/octavia/tasks/upgrade.yml
+++ b/ansible/roles/octavia/tasks/upgrade.yml
@@ -1,7 +1,7 @@
 ---
-- include_tasks: "config.yml"
+- include_tasks: config.yml
 
-- include_tasks: "bootstrap_service.yml"
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers
diff --git a/ansible/roles/redis/tasks/reconfigure.yml b/ansible/roles/redis/tasks/reconfigure.yml
index a5d205a835..f670a5b78d 100644
--- a/ansible/roles/redis/tasks/reconfigure.yml
+++ b/ansible/roles/redis/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "deploy.yml"
+- include_tasks: deploy.yml
diff --git a/ansible/roles/skydive/tasks/reconfigure.yml b/ansible/roles/skydive/tasks/reconfigure.yml
index a5d205a835..f670a5b78d 100644
--- a/ansible/roles/skydive/tasks/reconfigure.yml
+++ b/ansible/roles/skydive/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
 ---
-- include_tasks: "deploy.yml"
+- include_tasks: deploy.yml