diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index 8fbd547b43e538f4fdf0615765d1237056bb2470..cbaee32d78692f40b0863316ca4cb9a42fe0bfc7 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -54,7 +54,7 @@
 
 - name: Create dnsmasq RBAC manifests
   template:
-    src: "{{ item }}"
+    src: "{{ item }}.j2"
     dest: "{{ kube_config_dir }}/{{ item }}"
   with_items:
     - "dnsmasq-clusterrolebinding.yml"
@@ -74,12 +74,12 @@
 
 - name: Create dnsmasq manifests
   template:
-    src: "{{item.file}}"
+    src: "{{item.file}}.j2"
     dest: "{{kube_config_dir}}/{{item.file}}"
   with_items:
     - {name: dnsmasq, file: dnsmasq-deploy.yml, type: deployment}
     - {name: dnsmasq, file: dnsmasq-svc.yml, type: svc}
-    - {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml.j2, type: deployment}
+    - {name: dnsmasq-autoscaler, file: dnsmasq-autoscaler.yml, type: deployment}
   register: manifests
   delegate_to: "{{ groups['kube-master'][0] }}"
   run_once: true
diff --git a/roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml b/roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml
rename to roles/dnsmasq/templates/dnsmasq-clusterrolebinding.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-deploy.yml b/roles/dnsmasq/templates/dnsmasq-deploy.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-deploy.yml
rename to roles/dnsmasq/templates/dnsmasq-deploy.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-serviceaccount.yml b/roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-serviceaccount.yml
rename to roles/dnsmasq/templates/dnsmasq-serviceaccount.yml.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-svc.yml b/roles/dnsmasq/templates/dnsmasq-svc.yml.j2
similarity index 100%
rename from roles/dnsmasq/templates/dnsmasq-svc.yml
rename to roles/dnsmasq/templates/dnsmasq-svc.yml.j2