diff --git a/system/base/fail2ban/tasks/main.yml b/system/base/fail2ban/tasks/main.yml
index 720dac5..002f592 100644
--- a/system/base/fail2ban/tasks/main.yml
+++ b/system/base/fail2ban/tasks/main.yml
@@ -5,14 +5,14 @@
 
 - name: "configure fail2ban"
   ansible.builtin.template:
-    src: "./jail.local.j2"
+    src: "./jail.local"
     dest: "/etc/fail2ban/jail.local"
     mode: 0644
   register: system_base_fail2ban_conf
 
 - name: "configure fail2ban sshd jail"
   ansible.builtin.template:
-    src: "./jail.d/sshd.local.j2"
+    src: "./jail.d/sshd.local"
     dest: "/etc/fail2ban/jail.d/sshd.local"
     mode: 0644
   register: system_base_fail2ban_sshd_jail
diff --git a/system/base/fail2ban/templates/jail.d/sshd.local.j2 b/system/base/fail2ban/templates/jail.d/sshd.local
similarity index 100%
rename from system/base/fail2ban/templates/jail.d/sshd.local.j2
rename to system/base/fail2ban/templates/jail.d/sshd.local
diff --git a/system/base/fail2ban/templates/jail.local.j2 b/system/base/fail2ban/templates/jail.local
similarity index 100%
rename from system/base/fail2ban/templates/jail.local.j2
rename to system/base/fail2ban/templates/jail.local
diff --git a/system/base/mail/tasks/main.yml b/system/base/mail/tasks/main.yml
index e5e2017..dc1babc 100644
--- a/system/base/mail/tasks/main.yml
+++ b/system/base/mail/tasks/main.yml
@@ -1,14 +1,14 @@
 ---
 - name: "configure mailname"
   ansible.builtin.template:
-    src: "./mailname.j2"
+    src: "./mailname"
     dest: "/etc/mailname"
     mode: 0644
   register: system_mail_mailname
 
 - name: "configure mailutils"
   ansible.builtin.template:
-    src: "./mailutils.conf.j2"
+    src: "./mailutils.conf"
     dest: "/etc/mailutils.conf"
     mode: 0644
 
@@ -21,7 +21,7 @@
 
 - name: "configure aliases"
   ansible.builtin.template:
-    src: "./aliases.j2"
+    src: "./aliases"
     dest: "/etc/aliases"
     mode: 0644
   register: system_mail_aliases
@@ -34,14 +34,14 @@
 
 - name: "configure postfix"
   ansible.builtin.template:
-    src: "./postfix/main.cf.j2"
+    src: "./postfix/main.cf"
     dest: "/etc/postfix/main.cf"
     mode: 0644
   register: system_mail_postfix_conf
 
 - name: "configure credentials"
   ansible.builtin.template:
-    src: "./postfix/sasl_passwd.j2"
+    src: "./postfix/sasl_passwd"
     dest: "/etc/postfix/sasl_passwd"
     mode: 0600
   register: system_mail_postfix_credentials
diff --git a/system/base/mail/templates/aliases.j2 b/system/base/mail/templates/aliases
similarity index 100%
rename from system/base/mail/templates/aliases.j2
rename to system/base/mail/templates/aliases
diff --git a/system/base/mail/templates/mailname.j2 b/system/base/mail/templates/mailname
similarity index 100%
rename from system/base/mail/templates/mailname.j2
rename to system/base/mail/templates/mailname
diff --git a/system/base/mail/templates/mailutils.conf.j2 b/system/base/mail/templates/mailutils.conf
similarity index 100%
rename from system/base/mail/templates/mailutils.conf.j2
rename to system/base/mail/templates/mailutils.conf
diff --git a/system/base/mail/templates/postfix/main.cf.j2 b/system/base/mail/templates/postfix/main.cf
similarity index 100%
rename from system/base/mail/templates/postfix/main.cf.j2
rename to system/base/mail/templates/postfix/main.cf
diff --git a/system/base/mail/templates/postfix/sasl_passwd.j2 b/system/base/mail/templates/postfix/sasl_passwd
similarity index 100%
rename from system/base/mail/templates/postfix/sasl_passwd.j2
rename to system/base/mail/templates/postfix/sasl_passwd
diff --git a/system/base/nftables/tasks/main.yml b/system/base/nftables/tasks/main.yml
index 2fa2ff1..5f90101 100644
--- a/system/base/nftables/tasks/main.yml
+++ b/system/base/nftables/tasks/main.yml
@@ -5,7 +5,7 @@
 
 - name: "configure nftables"
   ansible.builtin.template:
-    src: "./nftables.conf.j2"
+    src: "./nftables.conf"
     dest: "/etc/nftables.conf"
     mode: 0755
   register: system_base_nftables_conf
diff --git a/system/base/nftables/templates/nftables.conf.j2 b/system/base/nftables/templates/nftables.conf
similarity index 100%
rename from system/base/nftables/templates/nftables.conf.j2
rename to system/base/nftables/templates/nftables.conf
diff --git a/system/base/sshd/tasks/main.yml b/system/base/sshd/tasks/main.yml
index 7c30ef3..aa83e27 100644
--- a/system/base/sshd/tasks/main.yml
+++ b/system/base/sshd/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - name: "configure sshd"
   ansible.builtin.template:
-    src: "./99-local.conf.j2"
+    src: "./99-local.conf"
     dest: "/etc/ssh/sshd_config.d/99-local.conf"
     mode: 0600
   register: system_base_sshd_conf
diff --git a/system/base/sshd/templates/99-local.conf.j2 b/system/base/sshd/templates/99-local.conf
similarity index 100%
rename from system/base/sshd/templates/99-local.conf.j2
rename to system/base/sshd/templates/99-local.conf
diff --git a/system/base/systemd_mail/tasks/main.yml b/system/base/systemd_mail/tasks/main.yml
index 1b84d7f..739ea9b 100644
--- a/system/base/systemd_mail/tasks/main.yml
+++ b/system/base/systemd_mail/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 - name: "systemd mail root script"
   ansible.builtin.template:
-    src: "./system/systemd-mail-systemctl-status.j2"
+    src: "./system/systemd-mail-systemctl-status"
     dest: "/usr/local/sbin/systemd-mail-systemctl-status"
     mode: 0755
 
 - name: "systemd mail user script"
   ansible.builtin.template:
-    src: "./user/systemd-mail-systemctl-status.j2"
+    src: "./user/systemd-mail-systemctl-status"
     dest: "/usr/local/bin/systemd-mail-systemctl-status"
     mode: 0755
 
diff --git a/system/base/systemd_mail/templates/system/systemd-mail-systemctl-status.j2 b/system/base/systemd_mail/templates/system/systemd-mail-systemctl-status
similarity index 100%
rename from system/base/systemd_mail/templates/system/systemd-mail-systemctl-status.j2
rename to system/base/systemd_mail/templates/system/systemd-mail-systemctl-status
diff --git a/system/base/systemd_mail/templates/user/systemd-mail-systemctl-status.j2 b/system/base/systemd_mail/templates/user/systemd-mail-systemctl-status
similarity index 100%
rename from system/base/systemd_mail/templates/user/systemd-mail-systemctl-status.j2
rename to system/base/systemd_mail/templates/user/systemd-mail-systemctl-status
diff --git a/system/base/unattended_upgrades/tasks/main.yml b/system/base/unattended_upgrades/tasks/main.yml
index b9e9b24..bc5b6cf 100644
--- a/system/base/unattended_upgrades/tasks/main.yml
+++ b/system/base/unattended_upgrades/tasks/main.yml
@@ -5,12 +5,12 @@
 
 - name: "configure unattended-upgrades"
   ansible.builtin.template:
-    src: "./50unattended-upgrades.j2"
+    src: "./50unattended-upgrades"
     dest: "/etc/apt/apt.conf.d/50unattended-upgrades"
     mode: 0644
 
 - name: "enable unattended-upgrades"
   ansible.builtin.template:
-    src: "./20auto-upgrades.j2"
+    src: "./20auto-upgrades"
     dest: "/etc/apt/apt.conf.d/20auto-upgrades"
     mode: 0644
diff --git a/system/base/unattended_upgrades/templates/20auto-upgrades.j2 b/system/base/unattended_upgrades/templates/20auto-upgrades
similarity index 100%
rename from system/base/unattended_upgrades/templates/20auto-upgrades.j2
rename to system/base/unattended_upgrades/templates/20auto-upgrades
diff --git a/system/base/unattended_upgrades/templates/50unattended-upgrades.j2 b/system/base/unattended_upgrades/templates/50unattended-upgrades
similarity index 100%
rename from system/base/unattended_upgrades/templates/50unattended-upgrades.j2
rename to system/base/unattended_upgrades/templates/50unattended-upgrades
diff --git a/vpn/bridge/tasks/main.yml b/vpn/bridge/tasks/main.yml
index 499eb60..29eb45f 100644
--- a/vpn/bridge/tasks/main.yml
+++ b/vpn/bridge/tasks/main.yml
@@ -1,21 +1,21 @@
 ---
 - name: "post-up nftables inet script"
   ansible.builtin.template:
-    src: "./post-up-br0-inet.nft.j2"
+    src: "./post-up-br0-inet.nft"
     dest: "/usr/local/sbin/post-up-br0-inet.nft"
     mode: 0755
   register: vpn_bridge_post_up_br0_inet_nft
 
 - name: "post-up nftables ipv4 script"
   ansible.builtin.template:
-    src: "./post-up-br0-ipv4.nft.j2"
+    src: "./post-up-br0-ipv4.nft"
     dest: "/usr/local/sbin/post-up-br0-ipv4.nft"
     mode: 0755
   register: vpn_bridge_post_up_br0_ipv4_nft
 
 - name: "configure interface"
   ansible.builtin.template:
-    src: "./br0.j2"
+    src: "./br0"
     dest: "/etc/network/interfaces.d/br0"
     mode: 0644
     validate: >
diff --git a/vpn/bridge/templates/br0.j2 b/vpn/bridge/templates/br0
similarity index 100%
rename from vpn/bridge/templates/br0.j2
rename to vpn/bridge/templates/br0
diff --git a/vpn/bridge/templates/post-up-br0-inet.nft.j2 b/vpn/bridge/templates/post-up-br0-inet.nft
similarity index 100%
rename from vpn/bridge/templates/post-up-br0-inet.nft.j2
rename to vpn/bridge/templates/post-up-br0-inet.nft
diff --git a/vpn/bridge/templates/post-up-br0-ipv4.nft.j2 b/vpn/bridge/templates/post-up-br0-ipv4.nft
similarity index 100%
rename from vpn/bridge/templates/post-up-br0-ipv4.nft.j2
rename to vpn/bridge/templates/post-up-br0-ipv4.nft
diff --git a/vpn/wireguard/tasks/main.yml b/vpn/wireguard/tasks/main.yml
index 14dee29..12e2473 100644
--- a/vpn/wireguard/tasks/main.yml
+++ b/vpn/wireguard/tasks/main.yml
@@ -5,28 +5,28 @@
 
 - name: "configure wireguard"
   ansible.builtin.template:
-    src: "./wg0.conf.j2"
+    src: "./wg0.conf"
     dest: "/etc/wireguard/wg0.conf"
     mode: 0600
   register: vpn_wireguard_conf
 
 - name: "post-up nftables inet script"
   ansible.builtin.template:
-    src: "./post-up-wg0-inet.nft.j2"
+    src: "./post-up-wg0-inet.nft"
     dest: "/usr/local/sbin/post-up-wg0-inet.nft"
     mode: 0755
   register: vpn_wireguard_post_up_wg0_inet_nft
 
 - name: "post-up nftables ipv4 script"
   ansible.builtin.template:
-    src: "./post-up-wg0-ipv4.nft.j2"
+    src: "./post-up-wg0-ipv4.nft"
     dest: "/usr/local/sbin/post-up-wg0-ipv4.nft"
     mode: 0755
   register: vpn_wireguard_post_up_wg0_ipv4_nft
 
 - name: "configure interface"
   ansible.builtin.template:
-    src: "./wg0.j2"
+    src: "./wg0"
     dest: "/etc/network/interfaces.d/wg0"
     mode: 0644
     validate: >
diff --git a/vpn/wireguard/templates/post-up-wg0-inet.nft.j2 b/vpn/wireguard/templates/post-up-wg0-inet.nft
similarity index 100%
rename from vpn/wireguard/templates/post-up-wg0-inet.nft.j2
rename to vpn/wireguard/templates/post-up-wg0-inet.nft
diff --git a/vpn/wireguard/templates/post-up-wg0-ipv4.nft.j2 b/vpn/wireguard/templates/post-up-wg0-ipv4.nft
similarity index 100%
rename from vpn/wireguard/templates/post-up-wg0-ipv4.nft.j2
rename to vpn/wireguard/templates/post-up-wg0-ipv4.nft
diff --git a/vpn/wireguard/templates/wg0.j2 b/vpn/wireguard/templates/wg0
similarity index 100%
rename from vpn/wireguard/templates/wg0.j2
rename to vpn/wireguard/templates/wg0
diff --git a/vpn/wireguard/templates/wg0.conf.j2 b/vpn/wireguard/templates/wg0.conf
similarity index 100%
rename from vpn/wireguard/templates/wg0.conf.j2
rename to vpn/wireguard/templates/wg0.conf