diff --git a/roles/firewall/tasks/ipt-gateway.yml b/roles/firewall/tasks/ipt-gateway.yml
index 8fa723a..0aeb6a6 100644
--- a/roles/firewall/tasks/ipt-gateway.yml
+++ b/roles/firewall/tasks/ipt-gateway.yml
@@ -259,7 +259,7 @@
 # ---
 
 - name: (ipt-gateway.yml) Configure firewall systemd service files
-  template:
+  ansible.builtin.template:
     src: etc/systemd/system/{{ item }}-firewall.service.j2
     dest: /etc/systemd/system/{{ item }}-firewall.service
   register: systemd_service_files_installed
diff --git a/roles/firewall/tasks/ipt-server.yml b/roles/firewall/tasks/ipt-server.yml
index f830ea4..5d3631f 100644
--- a/roles/firewall/tasks/ipt-server.yml
+++ b/roles/firewall/tasks/ipt-server.yml
@@ -1844,7 +1844,7 @@
 # ---
 
 - name: Configure firewall systemd service files
-  template:
+  ansible.builtin.template:
     src: etc/systemd/system/{{ item }}-firewall.service.j2
     dest: /etc/systemd/system/{{ item }}-firewall.service
   register: systemd_service_files_installed
diff --git a/roles/ipt-server/tasks/main.yml b/roles/ipt-server/tasks/main.yml
index 1b9fafb..db234ff 100644
--- a/roles/ipt-server/tasks/main.yml
+++ b/roles/ipt-server/tasks/main.yml
@@ -52,7 +52,7 @@
 # ===
 
 - name: Deploy interfaces_ipv4.conf from template
-  template:
+  ansible.builtin.template:
     src: etc/ipt-firewall/interfaces_ipv4.conf.j2
     dest: /etc/ipt-firewall/interfaces_ipv4.conf
     owner: root
@@ -63,7 +63,7 @@
     - Restart IPv4 Firewall
 
 - name: Deploy interfaces_ipv6.conf from template
-  template:
+  ansible.builtin.template:
     src: etc/ipt-firewall/interfaces_ipv6.conf.j2
     dest: /etc/ipt-firewall/interfaces_ipv6.conf
     owner: root
@@ -74,7 +74,7 @@
     - Restart IPv6 Firewall
 
 - name: Deploy main_ipv4.conf from template
-  template:
+  ansible.builtin.template:
     src: etc/ipt-firewall/main_ipv4.conf.j2
     dest: /etc/ipt-firewall/main_ipv4.conf
     owner: root
@@ -85,7 +85,7 @@
     - Restart IPv4 Firewall
 
 - name: Deploy main_ipv6.conf from template
-  template:
+  ansible.builtin.template:
     src: etc/ipt-firewall/main_ipv6.conf.j2
     dest: /etc/ipt-firewall/main_ipv6.conf
     owner: root
diff --git a/roles/network_interfaces/tasks/interfaces.yml b/roles/network_interfaces/tasks/interfaces.yml
index 770c842..8c1ffc7 100644
--- a/roles/network_interfaces/tasks/interfaces.yml
+++ b/roles/network_interfaces/tasks/interfaces.yml
@@ -14,7 +14,7 @@
     - network-interfaces
 
 - name: (interfaces.yml) Ensure interfaces file is latest
-  template:
+  ansible.builtin.template:
     src: "etc/network/interfaces.j2"
     dest: /etc/network/interfaces
   with_items: network_interfaces