diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml
index b8c7f28..4f7be5d 100644
--- a/roles/baseconfig/tasks/main.yml
+++ b/roles/baseconfig/tasks/main.yml
@@ -31,7 +31,7 @@
 - name: Configure APT mirrors
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   template:
-    src: 'apt/sources.list'
+    src: 'apt/sources.list.j2'
     dest: '/etc/apt/sources.list'
     mode: 0644
 
diff --git a/roles/baseconfig/templates/apt/sources.list b/roles/baseconfig/templates/apt/sources.list.j2
similarity index 100%
rename from roles/baseconfig/templates/apt/sources.list
rename to roles/baseconfig/templates/apt/sources.list.j2
diff --git a/roles/codimd/tasks/0_apt_dependencies.yml b/roles/codimd/tasks/0_apt_dependencies.yml
index 70b3fb1..38f36a1 100644
--- a/roles/codimd/tasks/0_apt_dependencies.yml
+++ b/roles/codimd/tasks/0_apt_dependencies.yml
@@ -3,7 +3,7 @@
 - name: Configure NodeJS pin
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   template:
-    src: apt/nodejs
+    src: apt/nodejs.j2
     dest: /etc/apt/preferences.d/nodejs
     mode: 0644
 
diff --git a/roles/codimd/templates/apt/nodejs b/roles/codimd/templates/apt/nodejs.j2
similarity index 100%
rename from roles/codimd/templates/apt/nodejs
rename to roles/codimd/templates/apt/nodejs.j2
diff --git a/roles/debian-backports/tasks/main.yml b/roles/debian-backports/tasks/main.yml
index c94c371..5e302e6 100644
--- a/roles/debian-backports/tasks/main.yml
+++ b/roles/debian-backports/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: Configure Debian Backports
   when: ansible_distribution == 'Debian'
   template:
-    src: 'backports.list'
-    dest: '/etc/apt/sources.list.d/backports.list'
+    src: backports.list.j2
+    dest: /etc/apt/sources.list.d/backports.list
     mode: 0644
 
diff --git a/roles/debian-backports/templates/backports.list b/roles/debian-backports/templates/backports.list.j2
similarity index 100%
rename from roles/debian-backports/templates/backports.list
rename to roles/debian-backports/templates/backports.list.j2
diff --git a/roles/dokuwiki/tasks/main.yml b/roles/dokuwiki/tasks/main.yml
index e8fb80e..d7e99e3 100644
--- a/roles/dokuwiki/tasks/main.yml
+++ b/roles/dokuwiki/tasks/main.yml
@@ -3,22 +3,21 @@
 - name: Configure Debian Buster mirrors
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   template:
-    src: 'apt/buster.list'
-    dest: '/etc/apt/sources.list.d/buster.list'
+    src: apt/buster.list.j2
+    dest: /etc/apt/sources.list.d/buster.list
     mode: 0644
 
 # For DokuWiki package
 - name: Configure DokuWiki pin
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   template:
-    src: 'apt/dokuwiki'
-    dest: '/etc/apt/preferences.d/dokuwiki'
+    src: apt/dokuwiki.j2
+    dest: /etc/apt/preferences.d/dokuwiki
     mode: 0644
 
 # Install
 - name: Install DokuWiki
   apt:
     name: dokuwiki
-    state: present
     update_cache: yes
 
diff --git a/roles/dokuwiki/templates/apt/buster.list b/roles/dokuwiki/templates/apt/buster.list.j2
similarity index 100%
rename from roles/dokuwiki/templates/apt/buster.list
rename to roles/dokuwiki/templates/apt/buster.list.j2
diff --git a/roles/dokuwiki/templates/apt/dokuwiki b/roles/dokuwiki/templates/apt/dokuwiki.j2
similarity index 100%
rename from roles/dokuwiki/templates/apt/dokuwiki
rename to roles/dokuwiki/templates/apt/dokuwiki.j2
diff --git a/roles/etherpad/tasks/0_apt_dependencies.yml b/roles/etherpad/tasks/0_apt_dependencies.yml
index 016f0a7..b7b8b72 100644
--- a/roles/etherpad/tasks/0_apt_dependencies.yml
+++ b/roles/etherpad/tasks/0_apt_dependencies.yml
@@ -3,7 +3,7 @@
 - name: Configure NodeJS pin
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   template:
-    src: 'apt/nodejs'
+    src: 'apt/nodejs.j2'
     dest: '/etc/apt/preferences.d/nodejs'
     mode: 0644
 
diff --git a/roles/etherpad/templates/apt/nodejs b/roles/etherpad/templates/apt/nodejs.j2
similarity index 100%
rename from roles/etherpad/templates/apt/nodejs
rename to roles/etherpad/templates/apt/nodejs.j2
diff --git a/roles/ldap-client/tasks/2_userland_scripts.yml b/roles/ldap-client/tasks/2_userland_scripts.yml
index bc0d446..9a3c57e 100644
--- a/roles/ldap-client/tasks/2_userland_scripts.yml
+++ b/roles/ldap-client/tasks/2_userland_scripts.yml
@@ -2,17 +2,17 @@
 # Disable passwd and chsh
 - name: Copy passwd and chsh scripts
   template:
-    src: "{{ item }}"
+    src: "{{ item }}.j2"
     dest: /usr/local/bin/
     mode: 0755
   with_items:
-    - 'chsh'
-    - 'passwd'
+    - chsh
+    - passwd
 
 # We do not want password change this way
 - name: Symlink chsh.ldap to chsh
   file:
-    src: "/usr/local/bin/chsh"
-    dest: "/usr/local/bin/chsh.ldap"
+    src: /usr/local/bin/chsh
+    dest: /usr/local/bin/chsh.ldap
     state: link
 
diff --git a/roles/ldap-client/templates/chsh b/roles/ldap-client/templates/chsh.j2
similarity index 100%
rename from roles/ldap-client/templates/chsh
rename to roles/ldap-client/templates/chsh.j2
diff --git a/roles/ldap-client/templates/passwd b/roles/ldap-client/templates/passwd.j2
similarity index 100%
rename from roles/ldap-client/templates/passwd
rename to roles/ldap-client/templates/passwd.j2