diff --git a/roles/ceph/tasks/main.yaml b/roles/ceph/tasks/main.yaml
index 43a7ba1..15c4421 100644
--- a/roles/ceph/tasks/main.yaml
+++ b/roles/ceph/tasks/main.yaml
@@ -59,7 +59,7 @@
 
 - name: Add ceph package sources
   template:
-    src: ceph.sources.tpl
+    src: ceph.sources.j2
     dest: /etc/apt/sources.list.d/ansible-ceph.sources
   #notify: Update apt
   when: 'ceph_roles|length > 0 and ceph_release != "distro"'
@@ -133,7 +133,7 @@
 # - name: Ceph - Set up config and keyrings
 - name: Transfer the cluster configuration
   template:
-    src: ceph.conf.tpl
+    src: ceph.conf.j2
     dest: /etc/ceph/ceph.conf
   notify: Restart Ceph
   when: 'ceph_roles|length > 0'
@@ -257,7 +257,7 @@
   when: '"mgr" in ceph_roles'
 
 - name: Create mgr keyring
-  delegate_to: "{{ lookup('template', 'ceph.monitors.names.tpl') | from_yaml | first }}"
+  delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   shell:
     cmd: ceph auth get-or-create mgr.{{ inventory_hostname_short }} mon 'allow profile mgr' osd 'allow *' mds 'allow *'
   register: mgr_keyring
@@ -291,7 +291,7 @@
   when: '"mds" in ceph_roles'
 
 - name: Create mds keyring
-  delegate_to: "{{ lookup('template', 'ceph.monitors.names.tpl') | from_yaml | first }}"
+  delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   shell:
     cmd: ceph auth get-or-create mds.{{ inventory_hostname_short }} mon 'profile mds' mgr 'profile mds' mds 'allow *' osd 'allow *'
   register: mds_keyring
@@ -325,7 +325,7 @@
   when: '"rgw" in ceph_roles'
 
 - name: Create Ceph rgw keyring
-  delegate_to: "{{ lookup('template', 'ceph.monitors.names.tpl') | from_yaml | first }}"
+  delegate_to: "{{ lookup('template', 'ceph.monitors.names.j2') | from_yaml | first }}"
   shell:
     cmd: ceph auth get-or-create client.rgw.{{ inventory_hostname_short }} mon 'allow rw' osd 'allow rwx'
   register: rgw_keyring
diff --git a/roles/ceph/templates/ceph.conf.tpl b/roles/ceph/templates/ceph.conf.j2
similarity index 100%
rename from roles/ceph/templates/ceph.conf.tpl
rename to roles/ceph/templates/ceph.conf.j2
diff --git a/roles/ceph/templates/ceph.monitors.tpl b/roles/ceph/templates/ceph.monitors.j2
similarity index 100%
rename from roles/ceph/templates/ceph.monitors.tpl
rename to roles/ceph/templates/ceph.monitors.j2
diff --git a/roles/ceph/templates/ceph.monitors.names.tpl b/roles/ceph/templates/ceph.monitors.names.j2
similarity index 100%
rename from roles/ceph/templates/ceph.monitors.names.tpl
rename to roles/ceph/templates/ceph.monitors.names.j2
diff --git a/roles/ceph/templates/ceph.sources.tpl b/roles/ceph/templates/ceph.sources.j2
similarity index 100%
rename from roles/ceph/templates/ceph.sources.tpl
rename to roles/ceph/templates/ceph.sources.j2