diff --git a/playbooks/deploy_edpm_telemetry_ceilometer.yml b/playbooks/deploy_edpm_telemetry_ceilometer.yaml
similarity index 84%
rename from playbooks/deploy_edpm_telemetry_ceilometer.yml
rename to playbooks/deploy_edpm_telemetry_ceilometer.yaml
index 1ecc6334e..2e8e967b9 100644
--- a/playbooks/deploy_edpm_telemetry_ceilometer.yml
+++ b/playbooks/deploy_edpm_telemetry_ceilometer.yaml
@@ -15,10 +15,10 @@
 # under the License.
 
 
-- hosts: "{{ primary_role_name | default([]) }}:{{ deploy_target_host | default('all') }}"
-  strategy: free
+- hosts: all
+  strategy: linear
   name: Deploy EDPM Ceilometer Agent Compute
-  gather_facts: "{{ gather_facts | default(false) }}"
+  gather_facts: true
   any_errors_fatal: true
   tasks:
     - name: Deploy ceilometer
diff --git a/playbooks/deploy_edpm_telemetry_infra.yml b/playbooks/deploy_edpm_telemetry_infra.yaml
similarity index 84%
rename from playbooks/deploy_edpm_telemetry_infra.yml
rename to playbooks/deploy_edpm_telemetry_infra.yaml
index 16922a974..c61cb551e 100644
--- a/playbooks/deploy_edpm_telemetry_infra.yml
+++ b/playbooks/deploy_edpm_telemetry_infra.yaml
@@ -15,10 +15,10 @@
 # under the License.
 
 
-- hosts: "{{ primary_role_name | default([]) }}:{{ deploy_target_host | default('all') }}"
-  strategy: free
+- hosts: all
+  strategy: linear
   name: Deploy EDPM Infrastructure Monitoring Tools
-  gather_facts: "{{ gather_facts | default(false) }}"
+  gather_facts: true
   any_errors_fatal: true
   tasks:
     - name: Deploy infra telemetry