diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 8fbf98763a..ce9baf04fb 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -111,7 +111,7 @@
     - packages
 
 #  - name: easy access to the postgresql databases
-#    template: src=$files/mailman/pgpass.j2 dest=/root/.pgpass
+#    ansible.builtin.template: src=$files/mailman/pgpass.j2 dest=/root/.pgpass
 #              owner=root group=root mode=0600
 
   - name: start services
diff --git a/playbooks/list-vms-per-host.yml b/playbooks/list-vms-per-host.yml
index 1163653295..1a956f9a86 100644
--- a/playbooks/list-vms-per-host.yml
+++ b/playbooks/list-vms-per-host.yml
@@ -16,5 +16,5 @@
   - virt: command=info
     register: virt_info
 
-  - template: src={{files}}/virthost-lists.j2 dest=/tmp/virthost-lists.out
+  - ansible.builtin.template: src={{files}}/virthost-lists.j2 dest=/tmp/virthost-lists.out
     delegate_to: localhost
diff --git a/playbooks/manual/fas-readonly/fas-readonly.yml b/playbooks/manual/fas-readonly/fas-readonly.yml
index b6e1ceae0f..e6550b4e51 100644
--- a/playbooks/manual/fas-readonly/fas-readonly.yml
+++ b/playbooks/manual/fas-readonly/fas-readonly.yml
@@ -8,7 +8,7 @@
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   tasks:
   - name: Copy the sql script to file
-    template: src=fas-readonly.sql dest=/var/lib/pgsql/fas-readonly.sql
+    ansible.builtin.template: src=fas-readonly.sql dest=/var/lib/pgsql/fas-readonly.sql
 
   - name: Change permissions for relevant tables in the fas db
     ansible.builtin.shell: psql -1 -v ON_ERROR_STOP=1 fas2 </var/lib/pgsql/fas-readonly.sql
diff --git a/playbooks/manual/fas-readonly/rollback-readonly.yml b/playbooks/manual/fas-readonly/rollback-readonly.yml
index 974def606f..568b31b849 100644
--- a/playbooks/manual/fas-readonly/rollback-readonly.yml
+++ b/playbooks/manual/fas-readonly/rollback-readonly.yml
@@ -8,7 +8,7 @@
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
   tasks:
   - name: Copy the sql script to file
-    template: src=rollback.sql dest=/var/lib/pgsql/rollback.sql
+    ansible.builtin.template: src=rollback.sql dest=/var/lib/pgsql/rollback.sql
 
   - name: Rollback permissions for relevant tables in the fas db
     ansible.builtin.shell: psql -1 -v ON_ERROR_STOP=1 fas2 </var/lib/pgsql/rollback.sql
diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml
index 0bb74296ed..cfe3e4b620 100644
--- a/playbooks/manual/ocp4-place-ignitionfiles.yml
+++ b/playbooks/manual/ocp4-place-ignitionfiles.yml
@@ -28,7 +28,7 @@
             state: directory
             mode: "0755"
         - name: == OCP KVM provisioning == Importing generated Ignition files
-          template:
+          ansible.builtin.template:
             src: "/srv/web/infra/bigfiles/openshiftboot/{{ env }}/{{ item }}"
             dest: "/var/www/html/rhcos/{{ item }}"
             mode: "0755"
@@ -37,7 +37,7 @@
             - controlplane.ign
             - worker.ign
         - name: == OCP KVM provisioning == Creating treeinfo for virt-install --location
-          template:
+          ansible.builtin.template:
             src: "/srv/web/infra/bigfiles/openshiftboot/ocp-treeinfo.j2"
             dest: "/var/www/html/rhcos/.treeinfo"
             mode: "0644"
diff --git a/playbooks/manual/releng/koji-release-tags.yml b/playbooks/manual/releng/koji-release-tags.yml
index ec8f8ec5c3..d9df250ea2 100644
--- a/playbooks/manual/releng/koji-release-tags.yml
+++ b/playbooks/manual/releng/koji-release-tags.yml
@@ -19,7 +19,7 @@
 
   pre_tasks:
   - name: copy the koji.conf file with the correct variables
-    template:
+    ansible.builtin.template:
       src: koji.conf.j2
       dest: /etc/koji.conf
       owner: root
diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml
index dc87359ef5..dcacd8fc02 100644
--- a/playbooks/manual/staging-sync/koji.yml
+++ b/playbooks/manual/staging-sync/koji.yml
@@ -60,7 +60,7 @@
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
   tasks:
-  - template: src=templates/koji-reset-staging.sql dest=/var/lib/pgsql/koji-reset-staging.sql
+  - ansible.builtin.template: src=templates/koji-reset-staging.sql dest=/var/lib/pgsql/koji-reset-staging.sql
     tags:
     - db-sync-script
 
diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml
index 0ba5e28f91..b8b841ff8f 100644
--- a/playbooks/manual/staging-sync/mailman.yml
+++ b/playbooks/manual/staging-sync/mailman.yml
@@ -34,7 +34,7 @@
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
   tasks:
-  # - template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql
+  # - ansible.builtin.template: src=templates/mailman-reset-staging.sql dest=/var/lib/pgsql/mailman-reset-staging.sql
   - ansible.builtin.copy:
       src: /srv/web/infra/db-dumps/mailman.dump.xz
       dest: /var/tmp/mailman.dump.xz
@@ -49,7 +49,7 @@
   # - name: Fix the database
   #  ansible.builtin.shell: psql -f /var/lib/pgsql/mailman-reset-staging.sql mailman
 
-  # - template: src=templates/hyperkitty-reset-staging.sql dest=/var/lib/pgsql/hyperkitty-reset-staging.sql
+  # - ansible.builtin.template: src=templates/hyperkitty-reset-staging.sql dest=/var/lib/pgsql/hyperkitty-reset-staging.sql
   - ansible.builtin.copy:
       src: /srv/web/infra/db-dumps/hyperkitty.dump.xz
       dest: /var/tmp/hyperkitty.dump.xz
diff --git a/roles/abrt/faf-pre/tasks/ssl.yml b/roles/abrt/faf-pre/tasks/ssl.yml
index 45680cb256..44f1463103 100644
--- a/roles/abrt/faf-pre/tasks/ssl.yml
+++ b/roles/abrt/faf-pre/tasks/ssl.yml
@@ -22,7 +22,7 @@
   - config
 
 - name: Install retrace ssl vhost
-  template: src="httpd/retrace_ssl.conf.j2" dest="/etc/httpd/conf.d/retrace_ssl.conf"
+  ansible.builtin.template: src="httpd/retrace_ssl.conf.j2" dest="/etc/httpd/conf.d/retrace_ssl.conf"
   when: letsencrypt is defined
   tags:
   - config
diff --git a/roles/abrt/faf/tasks/config.yml b/roles/abrt/faf/tasks/config.yml
index 4b01ba1c8e..8bd459a16f 100644
--- a/roles/abrt/faf/tasks/config.yml
+++ b/roles/abrt/faf/tasks/config.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Provide /etc/faf/faf.conf
-  template:
+  ansible.builtin.template:
     src: etc-faf-faf.conf.j2
     dest: /etc/faf/faf.conf
 
@@ -16,7 +16,7 @@
   when: faf_with_fedmsg|bool
 
 - name: Provide configuration for fedora-messaging
-  template:
+  ansible.builtin.template:
     src: etc-fedora-messaging-config.toml.j2
     dest: /etc/fedora-messaging/config.toml
   when: faf_with_fedmsg|bool
diff --git a/roles/abrt/faf/tasks/web.yml b/roles/abrt/faf/tasks/web.yml
index f528e93a71..9497cbc411 100644
--- a/roles/abrt/faf/tasks/web.yml
+++ b/roles/abrt/faf/tasks/web.yml
@@ -25,14 +25,14 @@
   when: faf_with_symboltransfer|bool
 
 - name: Provide /etc/faf/plugins/web.conf
-  template:
+  ansible.builtin.template:
     src: etc-faf-plugins-web.conf.j2
     dest: /etc/faf/plugins/web.conf
   notify:
   - restart httpd
 
 - name: Put webfaf on root (/) if configured
-  template:
+  ansible.builtin.template:
     src: etc-httpd-conf.d-faf-web.conf.j2
     dest: /etc/httpd/conf.d/faf-web.conf
   notify:
diff --git a/roles/abrt/retrace/tasks/config.yml b/roles/abrt/retrace/tasks/config.yml
index 42c5253c79..365cb3d316 100644
--- a/roles/abrt/retrace/tasks/config.yml
+++ b/roles/abrt/retrace/tasks/config.yml
@@ -1,20 +1,20 @@
 ---
 - name: Configure retrace-server
-  template:
+  ansible.builtin.template:
     src: etc-retrace-server.conf.j2
     dest: /etc/retrace-server/retrace-server.conf
     mode: "0644"
   notify: restart httpd
 
 - name: Retrace-server http config
-  template:
+  ansible.builtin.template:
     src: retrace-server-httpd.conf.j2
     dest: /etc/httpd/conf.d/retrace-server-httpd.conf
     mode: "0644"
   notify: restart httpd
 
 - name: Configure retrace-server hooks config
-  template:
+  ansible.builtin.template:
     src: etc-retrace-server-hooks.conf.j2
     dest: /etc/retrace-server/retrace-server-hooks.conf
     mode: "0644"
diff --git a/roles/ansible-server/tasks/main.yml b/roles/ansible-server/tasks/main.yml
index 26f8df9395..b592fc5ebd 100644
--- a/roles/ansible-server/tasks/main.yml
+++ b/roles/ansible-server/tasks/main.yml
@@ -20,7 +20,7 @@
   - ansible-server
 
 - name: Generate default ansible config
-  template: src=ansible.cfg.j2 dest=/etc/ansible/ansible.cfg owner=root group=root mode=0644
+  ansible.builtin.template: src=ansible.cfg.j2 dest=/etc/ansible/ansible.cfg owner=root group=root mode=0644
   tags:
   - ansible-server
 
diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index 55fa49c734..3a1d45ad1d 100644
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -55,7 +55,7 @@
   - apache
 
 - name: Add appserver headers.conf
-  template: src="{{ files }}/httpd/headers.conf.j2" dest=/etc/httpd/conf.d/headers.conf
+  ansible.builtin.template: src="{{ files }}/httpd/headers.conf.j2" dest=/etc/httpd/conf.d/headers.conf
   notify:
   - reload apache
   tags:
@@ -64,7 +64,7 @@
   - apache/headers
 
 - name: Add appserver h2.conf
-  template: src="{{ files }}/httpd/h2.conf.j2" dest=/etc/httpd/conf.d/h2.conf
+  ansible.builtin.template: src="{{ files }}/httpd/h2.conf.j2" dest=/etc/httpd/conf.d/h2.conf
   when: ansible_distribution == 'Fedora'
   notify:
   - reload apache
@@ -74,7 +74,7 @@
   - h2
 
 - name: Add apache_status location for collectd
-  template: src="{{ files }}/httpd/apachestatus.conf" dest=/etc/httpd/conf.d/apachestatus.conf
+  ansible.builtin.template: src="{{ files }}/httpd/apachestatus.conf" dest=/etc/httpd/conf.d/apachestatus.conf
   notify:
   - reload apache
   tags:
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index a4ede3f7ce..2e9d718dae 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -184,7 +184,7 @@
     - blocklist
 
 - name: Iptables
-  template:
+  ansible.builtin.template:
     src: "{{ item }}"
     dest: /etc/sysconfig/iptables
     mode: '0600'
@@ -213,7 +213,7 @@
   when: baseiptables|bool
 
 - name: Ip6tables
-  template: src={{ item }} dest=/etc/sysconfig/ip6tables mode=0600 backup=yes
+  ansible.builtin.template: src={{ item }} dest=/etc/sysconfig/ip6tables mode=0600 backup=yes
   with_first_found:
     - iptables/ip6tables.{{ datacenter }}
     - iptables/ip6tables.{{ inventory_hostname }}
@@ -422,7 +422,7 @@
   - common-scripts
 
 - name: Drop in a little system_identification note
-  template: src=system_identification dest=/etc/system_identification
+  ansible.builtin.template: src=system_identification dest=/etc/system_identification
   tags:
   - config
   - base
@@ -481,7 +481,7 @@
 
 # Set krb5 conf
 - name: Configure krb5
-  template: src=krb5.conf.j2 dest=/etc/krb5.conf owner=root group=root mode=0644
+  ansible.builtin.template: src=krb5.conf.j2 dest=/etc/krb5.conf owner=root group=root mode=0644
   when: not inventory_hostname.startswith('ipa')
   tags:
   - base
@@ -489,7 +489,7 @@
   - krb5
 
 - name: Configure krb5 (IPA master)
-  template: src=krb5.conf.master.j2 dest=/etc/krb5.conf owner=root group=root mode=0644
+  ansible.builtin.template: src=krb5.conf.master.j2 dest=/etc/krb5.conf owner=root group=root mode=0644
   when: inventory_hostname.startswith('ipa')
   tags:
   - base
diff --git a/roles/basessh/tasks/main.yml b/roles/basessh/tasks/main.yml
index 3d188d1e7a..e71aad9400 100644
--- a/roles/basessh/tasks/main.yml
+++ b/roles/basessh/tasks/main.yml
@@ -72,7 +72,7 @@
   - base
 
 - name: Sshd_config
-  template: src=sshd_config dest=/etc/ssh/sshd_config mode=0600
+  ansible.builtin.template: src=sshd_config dest=/etc/ssh/sshd_config mode=0600
   notify:
   - restart sshd
   tags:
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index 38bd23ffcb..d386c41b47 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -122,7 +122,7 @@
 #
 
 - name: Install the fedora-messaging configuration file
-  template: src=batcave-messaging.toml dest=/etc/fedora-messaging/batcave-messaging.toml
+  ansible.builtin.template: src=batcave-messaging.toml dest=/etc/fedora-messaging/batcave-messaging.toml
   tags:
   - batcave
   - config
@@ -358,7 +358,7 @@
   - httpd
 
 - name: Install web server config for batcave (main config)
-  template: src=infrastructure.fedoraproject.org.conf.j2 dest=/etc/httpd/conf.d/infrastructure.fedoraproject.org.conf mode=0644
+  ansible.builtin.template: src=infrastructure.fedoraproject.org.conf.j2 dest=/etc/httpd/conf.d/infrastructure.fedoraproject.org.conf mode=0644
   notify:
   - reload httpd
   tags:
@@ -402,7 +402,7 @@
 #
 
 - name: Install geoip download databases script
-  template:
+  ansible.builtin.template:
     src: geoip-download-databases
     dest: /usr/local/bin/geoip-download-databases
     mode: "0700"
diff --git a/roles/bkernel/tasks/main.yml b/roles/bkernel/tasks/main.yml
index 7732d662b2..850962b108 100644
--- a/roles/bkernel/tasks/main.yml
+++ b/roles/bkernel/tasks/main.yml
@@ -60,7 +60,7 @@
   - bkernel
 
 - name: Mock site-defaults.cfg
-  template:
+  ansible.builtin.template:
     src: bkernel-site-defaults.cfg
     dest: /etc/mock/site-defaults.cfg
     mode: "0644"
diff --git a/roles/blockerbugs/tasks/main.yml b/roles/blockerbugs/tasks/main.yml
index 60ecacfcdb..8172147e00 100644
--- a/roles/blockerbugs/tasks/main.yml
+++ b/roles/blockerbugs/tasks/main.yml
@@ -39,7 +39,7 @@
   - config
 
 - name: Setup blockerbugs app settings file
-  template: src=blockerbugs-settings.py.j2 dest=/etc/blockerbugs/settings.py mode=640
+  ansible.builtin.template: src=blockerbugs-settings.py.j2 dest=/etc/blockerbugs/settings.py mode=640
   notify:
   - reload httpd
   tags:
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index cf11907493..ebc8855783 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -60,7 +60,7 @@
   - bodhi
 
 - name: Put pungi configurations in place
-  template: src="{{item}}" dest=/etc/bodhi/{{item}}
+  ansible.builtin.template: src="{{item}}" dest=/etc/bodhi/{{item}}
   with_items:
   - pungi.module.conf.j2
   - pungi.rpm.conf.j2
@@ -105,7 +105,7 @@
 # cron job that syncs packages to koji
 #
 - name: Put owner-sync-pagure in place
-  template: src=owner-sync-pagure.j2 dest=/usr/local/bin/owner-sync-pagure mode="0755"
+  ansible.builtin.template: src=owner-sync-pagure.j2 dest=/usr/local/bin/owner-sync-pagure mode="0755"
   tags:
   - config
   - bodhi
@@ -148,7 +148,7 @@
   - koji-sync
 
 - name: Put the koji sync listener config file in place
-  template:
+  ansible.builtin.template:
     src: koji_sync_listener.toml
     dest: /etc/fedora-messaging/koji_sync_listener.toml
   when: env == "production"
@@ -286,8 +286,8 @@
   - cron
 
 - name: Install logging.yaml
-  template: >
-    src="{{  roles_path  }}/bodhi2/base/templates/logging.yaml.j2"
+  ansible.builtin.template: >
+    src="{{  roles_path  }}/bodhi2/base/templates/logging.yaml"
     dest="/etc/bodhi/logging.yaml"
     owner=apache
     group=apache
@@ -297,7 +297,7 @@
   - bodhi
 
 - name: Install production.ini
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/bodhi2/base/templates/production.ini.j2"
     dest: /etc/bodhi/production.ini
     owner: apache
@@ -308,7 +308,7 @@
   - bodhi
 
 - name: Install celeryconfig.py
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/bodhi2/base/templates/celeryconfig.py.j2"
     dest: /etc/bodhi/celeryconfig.py
     owner: apache
@@ -319,7 +319,7 @@
   - bodhi
 
 - name: Install fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/bodhi2/base/templates/fedora-messaging.toml.j2"
     dest: /etc/fedora-messaging/config.toml
     owner: apache
@@ -440,6 +440,6 @@
   - bodhi
 
 - name: Set up koji profile
-  template: src=kojiprofile.conf dest=/etc/koji.conf.d/bodhi.conf
+  ansible.builtin.template: src=kojiprofile.conf dest=/etc/koji.conf.d/bodhi.conf
   tags:
   - bodhi
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index aa9a24c7a9..c2b389be8c 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -25,7 +25,7 @@
     state: present
 
 - name: Configure alembic
-  template:
+  ansible.builtin.template:
     src: alembic.ini
     dest: /etc/bodhi/alembic.ini
     owner: bodhi
diff --git a/roles/btrfs/tasks/main.yml b/roles/btrfs/tasks/main.yml
index 4ce4970517..78c1d29137 100644
--- a/roles/btrfs/tasks/main.yml
+++ b/roles/btrfs/tasks/main.yml
@@ -16,7 +16,7 @@
 
 
 - name: Configure btrfs-balance timer
-  template:
+  ansible.builtin.template:
     src: schedule.conf.j2
     dest: /etc/systemd/system/btrfs-balance.timer.d/schedule.conf
     owner: root
diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml
index a029da30b0..99a13e6e3d 100644
--- a/roles/bugzilla2fedmsg/tasks/main.yml
+++ b/roles/bugzilla2fedmsg/tasks/main.yml
@@ -35,7 +35,7 @@
   - bugzilla2fedmsg
 
 - name: Copy the configuration for bugzilla2fedmsg over
-  template: >
+  ansible.builtin.template: >
     src=bugzilla2fedmsg.ini
     dest=/etc/moksha/production.ini
     owner=fedmsg
diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index 92afeece61..76dd5ef714 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -177,14 +177,14 @@
   - config
 
 - name: Configure fedora-messaging check-compose consumer
-  template: src=check-compose.toml.j2 dest=/etc/fedora-messaging/check-compose.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=check-compose.toml.j2 dest=/etc/fedora-messaging/check-compose.toml owner=root group=root mode=0640
   notify:
   - restart check-compose
   tags:
   - config
 
 - name: Install config file
-  template: src=check-compose.conf.j2 dest=/etc/check-compose.conf mode=0644
+  ansible.builtin.template: src=check-compose.conf.j2 dest=/etc/check-compose.conf mode=0644
   tags:
   - config
 
diff --git a/roles/chrony/tasks/main.yml b/roles/chrony/tasks/main.yml
index e5aeec097a..37416a4d6f 100644
--- a/roles/chrony/tasks/main.yml
+++ b/roles/chrony/tasks/main.yml
@@ -7,7 +7,7 @@
   - base
 
 - name: Install chrony.conf
-  template: src=chrony.conf.j2 dest=/etc/chrony.conf
+  ansible.builtin.template: src=chrony.conf.j2 dest=/etc/chrony.conf
   notify:
   - restart chronyd
   tags:
diff --git a/roles/clamav/tasks/main.yml b/roles/clamav/tasks/main.yml
index 73367ee912..a7cdb96a1d 100644
--- a/roles/clamav/tasks/main.yml
+++ b/roles/clamav/tasks/main.yml
@@ -31,7 +31,7 @@
   ansible.builtin.copy: src=freshclam-cron dest=/etc/cron.daily/freshclam
 
 - name: Setup the periodic clam scan script
-  template: >
+  ansible.builtin.template: >
     src=clamscan.sh.j2
     dest=/usr/local/bin/clamscan.sh
     mode=0755
diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml
index 778cee5d32..f4153e32cb 100644
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@@ -38,7 +38,7 @@
 
 # install collected.conf
 - name: /etc/collectd.conf
-  template: src=collectd.conf.j2 dest=/etc/collectd.conf
+  ansible.builtin.template: src=collectd.conf.j2 dest=/etc/collectd.conf
   tags:
   - collectd
   notify:
@@ -46,7 +46,7 @@
 
 # install collectd-network config
 - name: /etc/collectd.d/network.conf
-  template: src=network-client.conf.j2 dest=/etc/collectd.d/network.conf
+  ansible.builtin.template: src=network-client.conf.j2 dest=/etc/collectd.d/network.conf
   tags:
   - collectd
   notify:
diff --git a/roles/collectd/fedmsg-service/tasks/main.yml b/roles/collectd/fedmsg-service/tasks/main.yml
index 7dd3469dfb..5c356e76dc 100644
--- a/roles/collectd/fedmsg-service/tasks/main.yml
+++ b/roles/collectd/fedmsg-service/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Copy in /usr/local/bin/fedmsg-service-collectd
-  template: >
+  ansible.builtin.template: >
     src=fedmsg-service-collectd.py
     dest="/usr/local/bin/fedmsg-service-collectd-{{ process }}"
     mode=0755
@@ -11,7 +11,7 @@
   notify: restart collectd
 
 - name: Copy in /etc/collectd.d/fedmsg-service.conf
-  template: >
+  ansible.builtin.template: >
     src=fedmsg-service.conf
     dest=/etc/collectd.d/{{ process }}.conf
   tags:
diff --git a/roles/collectd/postgres/tasks/main.yml b/roles/collectd/postgres/tasks/main.yml
index ea87dc925a..65a21984d6 100644
--- a/roles/collectd/postgres/tasks/main.yml
+++ b/roles/collectd/postgres/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Copy in /usr/local/bin/collectd-postgres.sh
-  template: >
+  ansible.builtin.template: >
     src=collectd-postgres.sh
     dest=/usr/local/bin/collectd-postgres.sh
     mode=0755
@@ -10,7 +10,7 @@
   notify: restart collectd
 
 - name: Copy in /etc/collectd.d/postgres.conf
-  template: >
+  ansible.builtin.template: >
     src=postgres.conf
     dest=/etc/collectd.d/postgres.conf
   tags:
diff --git a/roles/collectd/rabbitmq/tasks/main.yml b/roles/collectd/rabbitmq/tasks/main.yml
index 7767aec691..3a15d6546d 100644
--- a/roles/collectd/rabbitmq/tasks/main.yml
+++ b/roles/collectd/rabbitmq/tasks/main.yml
@@ -16,7 +16,7 @@
   - collectd
 
 - name: Install collectd rabbitmq config
-  template:
+  ansible.builtin.template:
     src: "rabbitmq.collectd.conf.j2"
     dest: "/etc/collectd.d/rabbitmq.conf"
     owner: root
diff --git a/roles/collectd/web-service/tasks/main.yml b/roles/collectd/web-service/tasks/main.yml
index f97b7bdddd..563523ab81 100644
--- a/roles/collectd/web-service/tasks/main.yml
+++ b/roles/collectd/web-service/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Copy in /usr/local/bin/web-service-collectd
-  template: >
+  ansible.builtin.template: >
     src=web-service-collectd.py
     dest="/usr/local/bin/web-service-collectd-{{ site }}"
     mode=0755
@@ -10,7 +10,7 @@
   notify: restart collectd
 
 - name: Copy in /etc/collectd.d/web-service.conf
-  template: >
+  ansible.builtin.template: >
     src=web-service.conf
     dest=/etc/collectd.d/{{ site }}.conf
   tags:
diff --git a/roles/copr/backend/tasks/aws.yml b/roles/copr/backend/tasks/aws.yml
index c06555330c..831231f508 100644
--- a/roles/copr/backend/tasks/aws.yml
+++ b/roles/copr/backend/tasks/aws.yml
@@ -13,7 +13,7 @@
   - {user: resalloc, homedir: /var/lib/resallocserver}
 
 - name: Install aws credentials file
-  template: src=aws-credentials
+  ansible.builtin.template: src=aws-credentials
             dest="{{ item.homedir }}/.aws/credentials"
             owner={{ item.user }}
             group={{ item.user }}
@@ -23,7 +23,7 @@
   - {user: resalloc, homedir: /var/lib/resallocserver}
 
 - name: Install aws config file
-  template: src=aws-config
+  ansible.builtin.template: src=aws-config
             dest="{{ item.homedir }}/.aws/config"
             owner={{ item.user }}
             group={{ item.user }}
diff --git a/roles/copr/backend/tasks/copr-ping.yml b/roles/copr/backend/tasks/copr-ping.yml
index 966aea7165..1020311339 100644
--- a/roles/copr/backend/tasks/copr-ping.yml
+++ b/roles/copr/backend/tasks/copr-ping.yml
@@ -30,7 +30,7 @@
   tags: copr_ping
 
 - name: Install the ping script
-  template:
+  ansible.builtin.template:
     dest: "{{ ping_homedir }}/{{ ping_script }}"
     src: "{{ ping_script }}.j2"
     owner: "{{ ping_user }}"
@@ -39,7 +39,7 @@
   tags: copr_ping
 
 - name: Install the check script
-  template:
+  ansible.builtin.template:
     dest: "/usr/bin/copr-ping-check.py"
     src: "copr-ping-check.py.j2"
     owner: "{{ ping_user }}"
diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index 95712e52d0..89fb03d5eb 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -59,7 +59,7 @@
   ansible.builtin.copy: src="{{ private }}/files/copr/buildsys.priv" dest=/home/copr/.ssh/id_rsa owner=copr group=copr mode=600
 
 - name: Setup copr user ssh config file
-  template:
+  ansible.builtin.template:
     src: "ssh_config.j2"
     dest: /home/copr/.ssh/config
     owner: copr
@@ -94,7 +94,7 @@
 
 # setup webserver
 - name: Install lighttpd.conf
-  template: src="lighttpd/lighttpd.conf" dest=/etc/lighttpd/lighttpd.conf owner=root group=root mode=0644
+  ansible.builtin.template: src="lighttpd/lighttpd.conf" dest=/etc/lighttpd/lighttpd.conf owner=root group=root mode=0644
   notify:
   - restart lighttpd
   tags:
@@ -102,7 +102,7 @@
   - lighttpd_config
 
 - name: Add gzip content-encoding header by lua script
-  template: src="lighttpd/content-encoding-gzip-if-exists.lua" dest=/etc/lighttpd/content-encoding-gzip-if-exists.lua owner=root group=root mode=0644
+  ansible.builtin.template: src="lighttpd/content-encoding-gzip-if-exists.lua" dest=/etc/lighttpd/content-encoding-gzip-if-exists.lua owner=root group=root mode=0644
   notify:
   - restart lighttpd
   tags:
@@ -132,7 +132,7 @@
   - config
 
 - name: Install custom lighttpd template for directory listings
-  template: src="lighttpd/dir-generator.php.j2" dest="/var/lib/copr/public_html/dir-generator.php" owner=copr group=copr mode=0755
+  ansible.builtin.template: src="lighttpd/dir-generator.php.j2" dest="/var/lib/copr/public_html/dir-generator.php" owner=copr group=copr mode=0755
 
 - name: Install resalloc CGI script
   ansible.builtin.copy:
@@ -160,7 +160,7 @@
   tags: logrotate
 
 - name: Install custom logrotate config for lighttpd
-  template: src="logrotate/lighttpd.j2" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644
+  ansible.builtin.template: src="logrotate/lighttpd.j2" dest=/etc/logrotate.d/lighttpd owner=root group=root mode=644
   tags: logrotate
 
 - name: Start webserver
@@ -239,7 +239,7 @@
   when: devel|bool
 
 - name: Copy copr-be.conf
-  template: src="copr-be.conf.j2" dest=/etc/copr/copr-be.conf  owner=root group=copr mode=640
+  ansible.builtin.template: src="copr-be.conf.j2" dest=/etc/copr/copr-be.conf  owner=root group=copr mode=640
   notify:
   - restart copr-backend
   tags:
@@ -254,7 +254,7 @@
   - config
 
 - name: Install messaging config
-  template: src="fedora-messaging.conf.j2"
+  ansible.builtin.template: src="fedora-messaging.conf.j2"
             dest=/etc/copr/msgbuses/fedora-messaging.conf
             owner=copr group=copr mode=0600
   when: copr_messaging
@@ -264,7 +264,7 @@
   - config
 
 - name: Copy sign.conf
-  template: src=sign.conf dest=/etc/sign.conf  owner=root group=copr mode=640
+  ansible.builtin.template: src=sign.conf dest=/etc/sign.conf  owner=root group=copr mode=640
   tags:
   - config
 
@@ -313,7 +313,7 @@
     - clean_rh_subscriptions
 
 - name: Install cleanup-unused-vms script
-  template:
+  ansible.builtin.template:
     src: "{{ item }}"
     dest: /usr/local/bin/{{ item }}
     mode: "0755"
diff --git a/roles/copr/backend/tasks/pulp.yml b/roles/copr/backend/tasks/pulp.yml
index ba147914de..3869f91faf 100644
--- a/roles/copr/backend/tasks/pulp.yml
+++ b/roles/copr/backend/tasks/pulp.yml
@@ -25,7 +25,7 @@
   when: env == "production"
 
 - name: Install Pulp config file
-  template:
+  ansible.builtin.template:
     src: pulp-cli.toml
     dest: "/home/copr/.config/pulp/cli.toml"
     owner: copr
diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml
index 5e6c9a1a6c..f739af579d 100644
--- a/roles/copr/backend/tasks/resalloc.yml
+++ b/roles/copr/backend/tasks/resalloc.yml
@@ -119,7 +119,7 @@
   - provision_config
 
 - name: Resalloc, scripts
-  template: src="resalloc/{{ item }}.j2" dest="/var/lib/resallocserver/resalloc_provision/{{ item }}"
+  ansible.builtin.template: src="resalloc/{{ item }}.j2" dest="/var/lib/resallocserver/resalloc_provision/{{ item }}"
             mode=755
   with_items:
   - vm-delete
@@ -147,7 +147,7 @@
     mode: "0600"
 
 - name: Resalloc, ssh config file
-  template:
+  ansible.builtin.template:
     src: "ssh_config.j2"
     dest: /var/lib/resallocserver/.ssh/config
     owner: resalloc
@@ -158,7 +158,7 @@
     - provision_config
 
 - name: Resalloc, server config
-  template:
+  ansible.builtin.template:
     src: "resalloc/{{ item }}"
     dest: "/etc/resallocserver/{{ item }}"
     mode: "0640"
@@ -179,7 +179,7 @@
   when: not services_disabled|bool
 
 - name: Shortcuts around resalloc-aws-start
-  template: src="{{ roles_path }}/copr/backend/templates/provision/copr-resalloc-aws-new.j2"
+  ansible.builtin.template: src="{{ roles_path }}/copr/backend/templates/provision/copr-resalloc-aws-new.j2"
             dest="/usr/local/bin/copr-resalloc-aws-new-{{ item }}"
             mode=0755
   with_items:
diff --git a/roles/copr/backend/tasks/setup_provisioning_environment.yml b/roles/copr/backend/tasks/setup_provisioning_environment.yml
index e649cd6cea..3e8a5e8796 100644
--- a/roles/copr/backend/tasks/setup_provisioning_environment.yml
+++ b/roles/copr/backend/tasks/setup_provisioning_environment.yml
@@ -23,7 +23,7 @@
   - provision_config
 
 - name: Resalloc, generate vars.yml file
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
     dest: "{{ provision_directory }}/{{ item }}"
   with_items:
@@ -32,7 +32,7 @@
   - provision_config
 
 - name: Templated provision scripts
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
     dest: "{{ provision_directory }}/{{ item }}"
     mode: "0755"
@@ -45,7 +45,7 @@
   - cloud_vars is not defined
 
 - name: Templated provision scripts
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
     dest: "{{ provision_directory }}/{{ item }}"
     mode: "0755"
@@ -57,7 +57,7 @@
   - cloud_vars is defined and cloud_vars
 
 - name: Generate cloud-oriented vars files
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/copr/backend/templates/provision/{{ item }}"
     dest: "{{ provision_directory }}/{{ item }}"
   with_items:
@@ -68,7 +68,7 @@
   - cloud_vars is defined and cloud_vars
 
 - name: Put copr-rpmbuild configuration file into the provision subdir
-  template: src="{{ roles_path }}/copr/backend/templates/provision/copr-rpmbuild/main.ini.j2"
+  ansible.builtin.template: src="{{ roles_path }}/copr/backend/templates/provision/copr-rpmbuild/main.ini.j2"
             dest="{{ provision_directory }}/files/main.ini"
   tags:
   - provision_config
@@ -76,7 +76,7 @@
   when: "'copr_hypervisor' not in group_names"
 
 - name: Put rpkg configuration file into the provision subdir
-  template: src="{{ roles_path }}/copr/backend/templates/provision/rpkg.conf.j2"
+  ansible.builtin.template: src="{{ roles_path }}/copr/backend/templates/provision/rpkg.conf.j2"
             dest="{{ provision_directory }}/files/rpkg.conf"
   tags:
   - provision_config
@@ -88,7 +88,7 @@
   - provision_config
 
 - name: Install the Oregon State University OpenStack token file on BE/HV
-  template:
+  ansible.builtin.template:
     src: "{{ roles_path }}/copr/backend/templates/provision/rc-osuosl.sh.j2"
     dest: "{{ provision_directory }}/.rc-osuosl.sh"
     owner: "{{ provision_user }}"
diff --git a/roles/copr/base/tasks/main.yml b/roles/copr/base/tasks/main.yml
index 67dd81eb69..770182a35e 100644
--- a/roles/copr/base/tasks/main.yml
+++ b/roles/copr/base/tasks/main.yml
@@ -126,7 +126,7 @@
 #   tags: ipv6_config
 
 - name: Install nrpe checks
-  template: src=copr_nrpe.cfg
+  ansible.builtin.template: src=copr_nrpe.cfg
             dest=/etc/nrpe.d/copr_nrpe.cfg
   notify:
   - restart nrpe
diff --git a/roles/copr/certbot/tasks/letsencrypt.yml b/roles/copr/certbot/tasks/letsencrypt.yml
index 4edfc1685d..a19afee027 100644
--- a/roles/copr/certbot/tasks/letsencrypt.yml
+++ b/roles/copr/certbot/tasks/letsencrypt.yml
@@ -12,13 +12,13 @@
     - certbot
 
 - name: Install certbot config
-  template: src=certbot.j2 dest=/etc/sysconfig/certbot
+  ansible.builtin.template: src=certbot.j2 dest=/etc/sysconfig/certbot
             mode=0644
   tags:
     - certbot
 
 - name: Install certbot deploy script
-  template: src={{ letsencrypt.predefined_deploy_script }}
+  ansible.builtin.template: src={{ letsencrypt.predefined_deploy_script }}
             dest=/usr/libexec/auto-certbot-deploy
             mode=0755
   when: letsencrypt.predefined_deploy_script is defined
diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml
index e7cc654d24..e4241bebb9 100644
--- a/roles/copr/dist_git/tasks/main.yml
+++ b/roles/copr/dist_git/tasks/main.yml
@@ -41,7 +41,7 @@
   - /var/log/copr-dist-git/
 
 - name: Install config for copr-dist-git
-  template: src=copr-dist-git.conf.j2 dest=/etc/copr/copr-dist-git.conf mode=0644
+  ansible.builtin.template: src=copr-dist-git.conf.j2 dest=/etc/copr/copr-dist-git.conf mode=0644
   tags:
   - config
   - copr_infrastructure_password
@@ -79,7 +79,7 @@
   - reload httpd
 
 - name: Install /etc/httpd/conf.d/ssl.conf
-  template: src="ssl.conf.j2" dest="/etc/httpd/conf.d/ssl.conf" owner=root group=root mode=0644
+  ansible.builtin.template: src="ssl.conf.j2" dest="/etc/httpd/conf.d/ssl.conf" owner=root group=root mode=0644
   notify:
   - reload httpd
 
@@ -92,7 +92,7 @@
   - config
 
 - name: Install cgitrc
-  template: src="cgitrc" dest="/etc/cgitrc" owner=root group=root mode=0644
+  ansible.builtin.template: src="cgitrc" dest="/etc/cgitrc" owner=root group=root mode=0644
 
 - name: Allow httpd to run cgit
   seboolean: name=httpd_enable_cgi state=true persistent=true
@@ -135,7 +135,7 @@
   ansible.builtin.file: path=/home/copr-dist-git/.config state=directory
 
 - name: Install .config/copr for copr-dist-git user (required for pruning)
-  template: src="copr.conf" dest="/home/copr-dist-git/.config/copr" owner=copr-dist-git group=copr-dist-git
+  ansible.builtin.template: src="copr.conf" dest="/home/copr-dist-git/.config/copr" owner=copr-dist-git group=copr-dist-git
 
 - name: Install the helper cron scripts
   ansible.builtin.copy:
diff --git a/roles/copr/frontend/tasks/httpd.yml b/roles/copr/frontend/tasks/httpd.yml
index e52ec59a37..8fb0a6e415 100644
--- a/roles/copr/frontend/tasks/httpd.yml
+++ b/roles/copr/frontend/tasks/httpd.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Copy apache files to conf.d (templates)
-  template: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}"
+  ansible.builtin.template: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}"
   with_items:
   - "coprs.conf"
   notify:
diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml
index 5d48d49765..eead529d8f 100644
--- a/roles/copr/frontend/tasks/main.yml
+++ b/roles/copr/frontend/tasks/main.yml
@@ -84,7 +84,7 @@
         owner=copr-fe mode=755
 
 - name: Install copr configs
-  template: src="copr.conf" dest=/etc/copr/copr.conf mode=600
+  ansible.builtin.template: src="copr.conf" dest=/etc/copr/copr.conf mode=600
   notify:
   - reload httpd
   - restart copr-fe-fedora-messaging-reader
@@ -179,7 +179,7 @@
   ansible.builtin.file: path=/etc/fedora-messaging state=directory
 
 - name: Install fedora messaging config for Copr
-  template: src="fedora-messaging/copr_messaging.toml" dest="/etc/fedora-messaging/copr_messaging.toml"
+  ansible.builtin.template: src="fedora-messaging/copr_messaging.toml" dest="/etc/fedora-messaging/copr_messaging.toml"
   notify:
   - restart copr-fe-fedora-messaging-reader
   tags:
@@ -225,7 +225,7 @@
   dnf: name=nrpe state=present
 
 - name: Install the check script
-  template:
+  ansible.builtin.template:
     dest: "/usr/bin/copr-cdn-check.py"
     src: "copr-cdn-check.py.j2"
     group: "nagios"
diff --git a/roles/copr/frontend/tasks/psql_setup.yml b/roles/copr/frontend/tasks/psql_setup.yml
index 7c75f3bce4..9ffbc68882 100644
--- a/roles/copr/frontend/tasks/psql_setup.yml
+++ b/roles/copr/frontend/tasks/psql_setup.yml
@@ -34,7 +34,7 @@
   - config
 
 - name: Set up some cronjobs to backup databases as configured
-  template: >
+  ansible.builtin.template: >
     src="{{ files }}/../roles/postgresql_server/templates/cron-backup-database"
     dest="/etc/cron.d/cron-backup-database-{{ item }}"
   with_items:
diff --git a/roles/copr/hypervisor/tasks/main.yml b/roles/copr/hypervisor/tasks/main.yml
index 3f42b86b09..b9280490a9 100644
--- a/roles/copr/hypervisor/tasks/main.yml
+++ b/roles/copr/hypervisor/tasks/main.yml
@@ -110,7 +110,7 @@
   tags: libvirtd
 
 - name: Copy image pool config file to host
-  template: src=libvirt-pool-images.xml
+  ansible.builtin.template: src=libvirt-pool-images.xml
             dest=/root/.tmp-ansible-file.xml
   when: libvirt_pool_exists.changed
   tags: libvirtd
diff --git a/roles/copr/keygen/tasks/main.yml b/roles/copr/keygen/tasks/main.yml
index 20ce36d50f..d097e73423 100644
--- a/roles/copr/keygen/tasks/main.yml
+++ b/roles/copr/keygen/tasks/main.yml
@@ -22,7 +22,7 @@
   - config
 
 - name: Put config for signd
-  template: src="sign.conf" dest="/etc/sign.conf"
+  ansible.builtin.template: src="sign.conf" dest="/etc/sign.conf"
   notify:
   - restart obs-signd
   tags:
diff --git a/roles/debug_env/tasks/main.yml b/roles/debug_env/tasks/main.yml
index 725017c2a0..1a5b922d61 100644
--- a/roles/debug_env/tasks/main.yml
+++ b/roles/debug_env/tasks/main.yml
@@ -5,4 +5,4 @@
 #
 ---
 - name: Dump all ansible vars
-  template: src=dumpall.j2 dest=/tmp/debug_env.out
+  ansible.builtin.template: src=dumpall.j2 dest=/tmp/debug_env.out
diff --git a/roles/distgit/pagure/tasks/main.yml b/roles/distgit/pagure/tasks/main.yml
index 9bdee8c7e6..c8ac6e7eff 100644
--- a/roles/distgit/pagure/tasks/main.yml
+++ b/roles/distgit/pagure/tasks/main.yml
@@ -56,7 +56,7 @@
 #   - config
 
 # - name: Install stunnel.conf
-#   template: src={{ item.file }}
+#   ansible.builtin.template: src={{ item.file }}
 #             dest={{ item.dest }}
 #             owner=root group=root mode=0600
 #   with_items:
@@ -120,7 +120,7 @@
   - pagure
 
 - name: Copy sundry pagure configuration
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.location }}/{{ item.file }}
             owner=pagure group=postfix mode=0640
   with_items:
@@ -140,7 +140,7 @@
   - restart apache
 
 - name: Pagure configuration for the hooks
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.location }}/{{ item.file }}
             owner=pagure group=packager mode=0640
   with_items:
@@ -195,7 +195,7 @@
   - pagure
 
 - name: Install the apache configuration file
-  template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }}
+  ansible.builtin.template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }}
             owner=root group=root mode=0644
   with_items:
   - z_pagure.conf
@@ -207,7 +207,7 @@
   - restart apache
 
 - name: Install the wsgi file
-  template: src={{ item }}
+  ansible.builtin.template: src={{ item }}
             dest=/var/www/{{ item }}
             owner=pagure group=pagure mode=0644
   with_items:
@@ -327,7 +327,7 @@
   - fedora-messaging
 
 - name: Install the configuration file for fedora-messaging
-  template:
+  ansible.builtin.template:
     src=fedora-messaging.toml
     dest=/etc/fedora-messaging/config.toml
   tags:
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index 639b78752f..2e1f2327eb 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -28,14 +28,14 @@
   - distgit
 
 - name: Install the mod_auth_openidc configuration
-  template: src=auth_openidc.conf dest=/etc/httpd/conf.d/auth_openidc.conf
+  ansible.builtin.template: src=auth_openidc.conf dest=/etc/httpd/conf.d/auth_openidc.conf
   notify:
   - reload httpd
   tags:
   - distgit
 
 - name: Install the http push configuration
-  template: src=httppush.conf dest=/etc/httpd/conf.d/httpush.conf
+  ansible.builtin.template: src=httppush.conf dest=/etc/httpd/conf.d/httpush.conf
   notify:
   - reload httpd
   tags:
@@ -236,7 +236,7 @@
 # -- Lookaside Cache -------------------------------------
 # This is the annex to Dist Git, where we host source tarballs.
 - name: Install the Lookaside Cache httpd configs
-  template: src={{item}} dest=/etc/httpd/conf.d/dist-git/{{item}}
+  ansible.builtin.template: src={{item}} dest=/etc/httpd/conf.d/dist-git/{{item}}
   with_items:
   - lookaside.conf
   - lookaside-upload.conf
diff --git a/roles/docker-distribution/tasks/main.yml b/roles/docker-distribution/tasks/main.yml
index 406a28c180..735d740065 100644
--- a/roles/docker-distribution/tasks/main.yml
+++ b/roles/docker-distribution/tasks/main.yml
@@ -12,7 +12,7 @@
   - docker-distribution
 
 - name: Configure docker-distribution
-  template:
+  ansible.builtin.template:
     src: config.yml.j2
     dest: "{{ conf_path }}"
   notify: restart docker-distribution
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index f58d4ce7c4..6a9e89aa4c 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -34,7 +34,7 @@
   - selinux
 
 - name: /etc/motd_fedora
-  template: src=rsync/motd_fedora.j2 dest=/etc/motd_fedora
+  ansible.builtin.template: src=rsync/motd_fedora.j2 dest=/etc/motd_fedora
 
 - name: Configure logrotate for /var/log/rsyncd-fedora.log
   ansible.builtin.copy: src=logrotate-rsync-fedora dest=/etc/logrotate.d/rsync-fedora
@@ -65,7 +65,7 @@
   ansible.builtin.copy: src="{{private}}/files/httpd/wildcard-2024.fedoraproject.org.intermediate.cert" dest=/etc/pki/tls/certs/wildcard-2024.fedoraproject.org.intermediate.cert owner=root group=root mode=0644
 
 - name: Configure httpd dl main conf
-  template: src=httpd/dl.fedoraproject.org.conf dest=/etc/httpd/conf.d/dl.fedoraproject.org.conf
+  ansible.builtin.template: src=httpd/dl.fedoraproject.org.conf dest=/etc/httpd/conf.d/dl.fedoraproject.org.conf
   tags:
   - httpd
   - config
diff --git a/roles/easyfix/gather/tasks/main.yml b/roles/easyfix/gather/tasks/main.yml
index f50aeb4245..d585fc5eae 100644
--- a/roles/easyfix/gather/tasks/main.yml
+++ b/roles/easyfix/gather/tasks/main.yml
@@ -53,7 +53,7 @@
   - easyfix
 
 - name: Install the easyfix script
-  template: >
+  ansible.builtin.template: >
     src=gather_easyfix.py dest=/usr/local/bin/gather_easyfix.py
     owner=root group=root mode=0755
   tags:
diff --git a/roles/easyfix/proxy/tasks/main.yml b/roles/easyfix/proxy/tasks/main.yml
index a79cc009fa..e13856db27 100644
--- a/roles/easyfix/proxy/tasks/main.yml
+++ b/roles/easyfix/proxy/tasks/main.yml
@@ -6,7 +6,7 @@
   - easyfix/proxy
 
 - name: Put the proxy config in place
-  template: >
+  ansible.builtin.template: >
     src=gather-easyfix.conf
     dest=/etc/httpd/conf.d/{{website}}/gather-easyfix.conf
     owner=root group=root mode=0644
diff --git a/roles/fas2discourse/tasks/create-discourse-apikey-secret.yml b/roles/fas2discourse/tasks/create-discourse-apikey-secret.yml
index 27718c5738..731c5f7156 100644
--- a/roles/fas2discourse/tasks/create-discourse-apikey-secret.yml
+++ b/roles/fas2discourse/tasks/create-discourse-apikey-secret.yml
@@ -1,7 +1,7 @@
 ---
 # generate the templates for project to be created
 - name: Create the templates
-  template:
+  ansible.builtin.template:
     src: "secret-discourse-apikey.yml"
     dest: "/root/ocp4/openshift-apps/fas2discourse-operator/secret-discourse-apikey.yml"
     mode: "0770"
diff --git a/roles/fas2discourse/tasks/create-keytab-secret.yml b/roles/fas2discourse/tasks/create-keytab-secret.yml
index 66ac9deabe..57e16d5f81 100644
--- a/roles/fas2discourse/tasks/create-keytab-secret.yml
+++ b/roles/fas2discourse/tasks/create-keytab-secret.yml
@@ -9,7 +9,7 @@
 
 # generate the templates for project to be created
 - name: Copy the templates to the host
-  template:
+  ansible.builtin.template:
     src: "secret-keytab.yml"
     dest: "/root/ocp4/openshift-apps/fas2discourse-operator/secret-keytab.yml"
     mode: "0770"
diff --git a/roles/fas2discourse/tasks/create-operator-namespace.yml b/roles/fas2discourse/tasks/create-operator-namespace.yml
index e928ed244b..b3a1a54d75 100644
--- a/roles/fas2discourse/tasks/create-operator-namespace.yml
+++ b/roles/fas2discourse/tasks/create-operator-namespace.yml
@@ -1,7 +1,7 @@
 ---
 # generate the templates for project to be created
 - name: Create the templates
-  template:
+  ansible.builtin.template:
     src: "namespace.yml"
     dest: "/root/ocp4/openshift-apps/fas2discourse-operator/namespace.yml"
     mode: "0770"
diff --git a/roles/fasjson/tasks/main.yml b/roles/fasjson/tasks/main.yml
index 5a7a1caefd..0cbe2880cb 100644
--- a/roles/fasjson/tasks/main.yml
+++ b/roles/fasjson/tasks/main.yml
@@ -14,7 +14,7 @@
   - fasjson
 
 - name: Fasjson-aliases script
-  template: src=fasjson-aliases.j2 dest=/usr/local/bin/fasjson-aliases owner=root mode=0755
+  ansible.builtin.template: src=fasjson-aliases.j2 dest=/usr/local/bin/fasjson-aliases owner=root mode=0755
   tags:
   - config
   - fasjson
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 471f11c1b8..bc8a1dab19 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -69,7 +69,7 @@
 # *conditionally* restart these services, only if they are installed on the
 # system.
 - name: Setup basic /etc/fedmsg.d/ contents for internal hosts
-  template: >
+  ansible.builtin.template: >
     src="{{ item }}.j2"
     dest="/etc/fedmsg.d/{{ item }}"
     owner=root
@@ -100,7 +100,7 @@
   - restart fedmsg-relay
 
 - name: Dynamically generate policy from group/host vars.
-  template: >
+  ansible.builtin.template: >
     src="{{ item }}.j2"
     dest="/etc/fedmsg.d/{{ item }}"
     owner=root
@@ -122,7 +122,7 @@
   - restart fedmsg-relay
 
 - name: Setup basic /etc/fedmsg.d/ contents for firewalled/external hosts
-  template: >
+  ansible.builtin.template: >
     src="{{ item }}.j2"
     dest="/etc/fedmsg.d/{{ item }}"
     owner=root
diff --git a/roles/fedmsg/crl/tasks/main.yml b/roles/fedmsg/crl/tasks/main.yml
index 82e852b273..f92795adc7 100644
--- a/roles/fedmsg/crl/tasks/main.yml
+++ b/roles/fedmsg/crl/tasks/main.yml
@@ -33,7 +33,7 @@
   - fedmsg/proxy
 
 - name: Put the proxy config in place
-  template: >
+  ansible.builtin.template: >
     src=fedmsg.conf
     dest=/etc/httpd/conf.d/{{website}}/fedmsg.conf
     owner=root group=root mode=0644
diff --git a/roles/fedmsg/gateway/slave/tasks/main.yml b/roles/fedmsg/gateway/slave/tasks/main.yml
index 3b0f12f578..78e2c09528 100644
--- a/roles/fedmsg/gateway/slave/tasks/main.yml
+++ b/roles/fedmsg/gateway/slave/tasks/main.yml
@@ -46,7 +46,7 @@
   - fedmsg/gateway/slave
 
 - name: Install /etc/fedmsg.d/fedmsg-gateway-slave.py
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.dest }}
             owner=root group=root mode=0644
   with_items:
@@ -86,7 +86,7 @@
   - fedmsg/gateway/slave
 
 - name: Install stunnel.conf
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.dest }}
             owner=root group=root mode=0600
   with_items:
diff --git a/roles/fedmsg/hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml
index 206d3f6503..7e5cee5356 100644
--- a/roles/fedmsg/hub/tasks/main.yml
+++ b/roles/fedmsg/hub/tasks/main.yml
@@ -73,7 +73,7 @@
   - fedmsg/hub
 
 - name: Install systemd config file
-  template:
+  ansible.builtin.template:
     src: fedmsg-hub-systemd.conf.j2
     dest: "/etc/systemd/system/{{ item }}.service.d/systemd.conf"
   with_items:
diff --git a/roles/fedmsg/irc/tasks/main.yml b/roles/fedmsg/irc/tasks/main.yml
index 8e75695179..ba26fd7f17 100644
--- a/roles/fedmsg/irc/tasks/main.yml
+++ b/roles/fedmsg/irc/tasks/main.yml
@@ -22,7 +22,7 @@
   - fedmsgmonitor
 
 - name: Setup fedmsg-irc config file
-  template: src=ircbot.py dest=/etc/fedmsg.d/ircbot.py
+  ansible.builtin.template: src=ircbot.py dest=/etc/fedmsg.d/ircbot.py
   tags:
   - config
   - fedmsg/irc
@@ -30,7 +30,7 @@
   - restart fedmsg-irc
 
 - name: Setup fas credentials config file
-  template: >
+  ansible.builtin.template: >
     src=fas-credentials.py
     dest=/etc/fedmsg.d/fas-credentials.py
     mode=0640
diff --git a/roles/fedora-budget/build/tasks/main.yml b/roles/fedora-budget/build/tasks/main.yml
index 99a6892ad4..7a07baffa6 100644
--- a/roles/fedora-budget/build/tasks/main.yml
+++ b/roles/fedora-budget/build/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.file: dest=/srv/web/budget.fedoraproject.org state=directory
 
-- template: >
+- ansible.builtin.template: >
     src=budget-sync.j2 dest=/usr/local/bin/budget-sync
     owner=root group=root mode=0755
   tags:
diff --git a/roles/fedora-docs/build/tasks/main.yml b/roles/fedora-docs/build/tasks/main.yml
index ee240e4121..98f2388774 100644
--- a/roles/fedora-docs/build/tasks/main.yml
+++ b/roles/fedora-docs/build/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- template: >
+- ansible.builtin.template: >
     src=docs-sync.j2 dest=/usr/local/bin/docs-sync
     owner=root group=root mode=0755
   tags:
diff --git a/roles/fedora-web/main/tasks/main.yml b/roles/fedora-web/main/tasks/main.yml
index 286ea08f48..bb26088382 100644
--- a/roles/fedora-web/main/tasks/main.yml
+++ b/roles/fedora-web/main/tasks/main.yml
@@ -27,7 +27,7 @@
   - fedoraproject_s3_bucket_name is defined
 
 - name: Create fedoraproject-sync script
-  template:
+  ansible.builtin.template:
     src: fedoraproject-sync
     dest: /usr/local/sbin/fedoraproject-sync
     mode: "0700"
@@ -68,7 +68,7 @@
   - fedora-web/google-site-verification
 
 - name: And one template (for {{website}})
-  template: >
+  ansible.builtin.template: >
     src={{item}} dest=/etc/httpd/conf.d/{{website}}/{{item}}
     owner=root group=root mode=0644
   with_items:
@@ -107,7 +107,7 @@
   - fedora-web/google-site-verification
 
 - name: And, copy over a template for browserid
-  template: >
+  ansible.builtin.template: >
     src=browserid.fedoraproject.org dest=/srv/web/browserid.fedoraproject.org
     owner=root group=root mode=0644
   notify:
diff --git a/roles/fedora-web/registry/tasks/main.yml b/roles/fedora-web/registry/tasks/main.yml
index 83105351b7..11d133a7f9 100644
--- a/roles/fedora-web/registry/tasks/main.yml
+++ b/roles/fedora-web/registry/tasks/main.yml
@@ -19,7 +19,7 @@
   - fedora-web/registry
 
 - name: Copy in the sync-registry-index cronjob
-  template: src=cron-sync-registry-index dest=/etc/cron.d/sync-registry-index
+  ansible.builtin.template: src=cron-sync-registry-index dest=/etc/cron.d/sync-registry-index
   tags:
   - fedora-web
   - fedora-web/registry
diff --git a/roles/fedora_nightlies/tasks/main.yml b/roles/fedora_nightlies/tasks/main.yml
index 09d4062386..279b68e5f6 100644
--- a/roles/fedora_nightlies/tasks/main.yml
+++ b/roles/fedora_nightlies/tasks/main.yml
@@ -143,7 +143,7 @@
   - config
 
 - name: Configure fedora-messaging fedora_nightlies
-  template: src=fedora_nightlies.toml.j2 dest=/etc/fedora-messaging/fedora_nightlies.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=fedora_nightlies.toml.j2 dest=/etc/fedora-messaging/fedora_nightlies.toml owner=root group=root mode=0640
   notify:
   - restart fedora_nightlies
   tags:
diff --git a/roles/flatpak-cache/tasks/main.yml b/roles/flatpak-cache/tasks/main.yml
index 4374961da3..3e474a5e8e 100644
--- a/roles/flatpak-cache/tasks/main.yml
+++ b/roles/flatpak-cache/tasks/main.yml
@@ -33,7 +33,7 @@
   - config
 
 - name: Install squid configuration file
-  template: src=squid.conf dest=/etc/squid/squid.conf owner=squid group=squid
+  ansible.builtin.template: src=squid.conf dest=/etc/squid/squid.conf owner=squid group=squid
   tags:
   - flatpak-cache
   - config
diff --git a/roles/geoip-city-wsgi/proxy/tasks/main.yml b/roles/geoip-city-wsgi/proxy/tasks/main.yml
index af363efc8b..4df2597f5d 100644
--- a/roles/geoip-city-wsgi/proxy/tasks/main.yml
+++ b/roles/geoip-city-wsgi/proxy/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Copy in the proxy conf
-  template: >
+  ansible.builtin.template: >
     src=geoip-city-wsgi-proxy.conf
     dest=/etc/httpd/conf.d/{{website}}/geoip-city-wsgi-proxy.conf
     owner=root group=root mode=0644
diff --git a/roles/git/server/tasks/main.yml b/roles/git/server/tasks/main.yml
index 8b3b1929e6..2346d4260c 100644
--- a/roles/git/server/tasks/main.yml
+++ b/roles/git/server/tasks/main.yml
@@ -17,7 +17,7 @@
   tags: git/server
 
 - name: Configure git daemon
-  template: >
+  ansible.builtin.template: >
     src="git@.service.j2"
     dest="/usr/lib/systemd/system/git@.service"
     mode=0644
@@ -25,7 +25,7 @@
   tags: git/server
 
 - name: Configure git daemon
-  template: >
+  ansible.builtin.template: >
     src="git@.service.j2"
     dest="/usr/lib/systemd/system/git@.service"
     mode=0644
@@ -39,7 +39,7 @@
   tags: git/server
 
 - name: Install the xinetd config file
-  template: >
+  ansible.builtin.template: >
     src="git.j2"
     dest="/etc/xinetd.d/git"
     mode=0644
diff --git a/roles/github2fedmsg/tasks/main.yml b/roles/github2fedmsg/tasks/main.yml
index 1cfe28edab..69c5ac5b5d 100644
--- a/roles/github2fedmsg/tasks/main.yml
+++ b/roles/github2fedmsg/tasks/main.yml
@@ -21,7 +21,7 @@
   - github2fedmsg
 
 - name: Copy github2fedmsg app configuration
-  template: >
+  ansible.builtin.template: >
     src={{ item }} dest="/etc/github2fedmsg/{{ item }}"
     owner=apache group=apache mode=0600
   with_items:
@@ -45,7 +45,7 @@
   - restart apache
 
 - name: Copy github2fedmsg httpd config
-  template: >
+  ansible.builtin.template: >
     src={{ item }} dest="/etc/httpd/conf.d/{{ item }}"
     owner=apache group=apache mode=0644
   with_items:
diff --git a/roles/grokmirror_mirror/tasks/main.yml b/roles/grokmirror_mirror/tasks/main.yml
index 8799af6335..6a5c13292c 100644
--- a/roles/grokmirror_mirror/tasks/main.yml
+++ b/roles/grokmirror_mirror/tasks/main.yml
@@ -22,16 +22,16 @@
   - grokmirror-mirror
 
 - name: Install grokmirror config file from template
-  template: src=grokmirror.conf dest={{grokmirror_topdir}}/grokmirror.conf owner=root group=root mode=644
+  ansible.builtin.template: src=grokmirror.conf dest={{grokmirror_topdir}}/grokmirror.conf owner=root group=root mode=644
   tags:
   - grokmirror-mirror
 
 - name: Install grokmirror repos cron job
-  template: src=grokmirror.cron dest=/etc/cron.d/grokmirror.cron owner=root group=root mode=644
+  ansible.builtin.template: src=grokmirror.cron dest=/etc/cron.d/grokmirror.cron owner=root group=root mode=644
   tags:
   - grokmirror-mirror
 
 - name: Install grokmirror fsck cron job
-  template: src=grokfsck.cron dest=/etc/cron.d/grokfsck.cron owner=root group=root mode=644
+  ansible.builtin.template: src=grokfsck.cron dest=/etc/cron.d/grokfsck.cron owner=root group=root mode=644
   tags:
   - grokmirror-mirror
diff --git a/roles/haproxy/rewrite/tasks/main.yml b/roles/haproxy/rewrite/tasks/main.yml
index 42a78f2390..ef8fa1f63b 100644
--- a/roles/haproxy/rewrite/tasks/main.yml
+++ b/roles/haproxy/rewrite/tasks/main.yml
@@ -5,7 +5,7 @@
   - haproxy
   - haproxy/rewrite
 
-- template: src=rewrite.conf dest=/etc/httpd/conf.d/{{website}}/haproxy.conf
+- ansible.builtin.template: src=rewrite.conf dest=/etc/httpd/conf.d/{{website}}/haproxy.conf
   notify:
   - reload httpd
   tags:
@@ -13,7 +13,7 @@
   - haproxy/rewrite
   when: not inventory_hostname.startswith('proxy')
 
-- template: src=rewrite.conf dest=/etc/httpd/conf.d/{{website}}/haproxy.conf
+- ansible.builtin.template: src=rewrite.conf dest=/etc/httpd/conf.d/{{website}}/haproxy.conf
   notify:
   - reload proxyhttpd
   tags:
diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
index ce4559c8c7..5e20abc427 100644
--- a/roles/haproxy/tasks/main.yml
+++ b/roles/haproxy/tasks/main.yml
@@ -11,7 +11,7 @@
   - haproxy
 
 - name: Install haproxy/cfg
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
         dest={{ item.dest }}
         owner=root group=root mode=0600
   with_items:
diff --git a/roles/httpd/domainrewrite/tasks/main.yml b/roles/httpd/domainrewrite/tasks/main.yml
index d0778ded4a..99f4c87148 100644
--- a/roles/httpd/domainrewrite/tasks/main.yml
+++ b/roles/httpd/domainrewrite/tasks/main.yml
@@ -7,7 +7,7 @@
 
 ---
 - name: Copy in domain rewrite for {{destname}} ({{website}}{{path}})
-  template: >
+  ansible.builtin.template: >
     src={{item}}
     dest=/etc/httpd/conf.d/{{website}}/{{destname}}-rewrite.conf
     owner=root
diff --git a/roles/httpd/mime-type/tasks/main.yml b/roles/httpd/mime-type/tasks/main.yml
index d836a1e184..7a3b57428a 100644
--- a/roles/httpd/mime-type/tasks/main.yml
+++ b/roles/httpd/mime-type/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- template: >
+- ansible.builtin.template: >
     src=mime-types.conf dest=/etc/httpd/conf.d/{{website}}/mime-types.conf
     owner=root group=root mode=0644
   notify:
diff --git a/roles/httpd/proxy/tasks/main.yml b/roles/httpd/proxy/tasks/main.yml
index 6551b7d9b3..d09d6304b3 100644
--- a/roles/httpd/proxy/tasks/main.yml
+++ b/roles/httpd/proxy/tasks/main.yml
@@ -6,7 +6,7 @@
   - reload proxyhttpd
 
 - name: Copy in the main httpd.conf file for proxy nodes
-  template: >
+  ansible.builtin.template: >
     src=httpd.conf.j2 dest=/etc/httpd/conf/httpd.conf
     owner=root group=root mode=0644
   notify:
@@ -24,7 +24,7 @@
   - httpd/proxy
 
 - name: Copy over some basic configs into /etc/httpd/conf.d/
-  template: >
+  ansible.builtin.template: >
     src={{item}} dest=/etc/httpd/conf.d/{{item}}
     owner=root group=root mode=0644
   with_items:
diff --git a/roles/httpd/redirect/tasks/main.yml b/roles/httpd/redirect/tasks/main.yml
index bfa5e8b827..5c097ed882 100644
--- a/roles/httpd/redirect/tasks/main.yml
+++ b/roles/httpd/redirect/tasks/main.yml
@@ -8,7 +8,7 @@
 # This is the only real work we do.
 ---
 - name: Copy over httpd redirect file for {{shortname}}
-  template: >
+  ansible.builtin.template: >
     src={{item}}
     dest=/etc/httpd/conf.d/{{website}}/{{shortname}}-redirect.conf
     mode=0644
diff --git a/roles/httpd/redirectmatch/tasks/main.yml b/roles/httpd/redirectmatch/tasks/main.yml
index f7d11daf32..5eee0d91c2 100644
--- a/roles/httpd/redirectmatch/tasks/main.yml
+++ b/roles/httpd/redirectmatch/tasks/main.yml
@@ -15,7 +15,7 @@
     mode: '0755'
 
 - name: Copy over httpd redirectmatch file for {{shortname}}
-  template: >
+  ansible.builtin.template: >
     src=redirectmatch.conf
     dest=/etc/httpd/conf.d/{{website}}/{{shortname}}-redirectmatch.conf
     mode=0644
diff --git a/roles/httpd/reverseproxy/tasks/main.yml b/roles/httpd/reverseproxy/tasks/main.yml
index 2a09d1f06a..c2bafa89f8 100644
--- a/roles/httpd/reverseproxy/tasks/main.yml
+++ b/roles/httpd/reverseproxy/tasks/main.yml
@@ -9,7 +9,7 @@
 
 ---
 - name: Copy in ProxyPassReverse for {{destname}} ({{website}}{{remotepath}})
-  template: >
+  ansible.builtin.template: >
     src={{item}}
     dest=/etc/httpd/conf.d/{{website}}/{{destname}}.conf
     owner=root
diff --git a/roles/httpd/website/tasks/main.yml b/roles/httpd/website/tasks/main.yml
index 9b8ecd8ea3..e5dff455f8 100644
--- a/roles/httpd/website/tasks/main.yml
+++ b/roles/httpd/website/tasks/main.yml
@@ -30,7 +30,7 @@
   - letsencrypt
 
 - name: Copy over primary template for {{site_name}}
-  template: >
+  ansible.builtin.template: >
     src=website.conf
     dest=/etc/httpd/conf.d/{{site_name}}.conf
     owner=root
@@ -45,7 +45,7 @@
   - sslciphers
 
 - name: Copy over some subordinate templates for {{site_name}}
-  template: >
+  ansible.builtin.template: >
     src={{item}}.conf
     dest=/etc/httpd/conf.d/{{site_name}}/{{item}}.conf
     owner=root
@@ -77,7 +77,7 @@
   - robots
 
 - name: And lastly, the robots.txt file
-  template: >
+  ansible.builtin.template: >
     src={{item}}
     dest=/srv/web/{{site_name}}-robots.txt
     mode=0644
diff --git a/roles/ipa/client/tasks/main.yml b/roles/ipa/client/tasks/main.yml
index fc4e266c75..38f53ef494 100644
--- a/roles/ipa/client/tasks/main.yml
+++ b/roles/ipa/client/tasks/main.yml
@@ -74,7 +74,7 @@
   run_once: yes
 
 - name: Ensure that nss knows to skip certain users (f41/rhel)
-  template: src=fedora-nss-ignore.conf.j2 dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=sssd group=sssd
+  ansible.builtin.template: src=fedora-nss-ignore.conf.j2 dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=sssd group=sssd
   tags:
   - ipa/client
   - config
@@ -85,7 +85,7 @@
   when: ansible_distribution_major_version|int >= 41 or ansible_distribution == 'RedHat'
 
 - name: Ensure that nss knows to skip certain users (f40)
-  template: src=fedora-nss-ignore.conf.j2 dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=root group=root
+  ansible.builtin.template: src=fedora-nss-ignore.conf.j2 dest=/etc/sssd/conf.d/fedora-nss-ignore.conf mode=600 owner=root group=root
   tags:
   - ipa/client
   - config
diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml
index 477d4e0f24..489e69bf80 100644
--- a/roles/ipsilon/tasks/main.yml
+++ b/roles/ipsilon/tasks/main.yml
@@ -106,7 +106,7 @@
   - config
 
 - name: Copy ipsilon configuration
-  template:
+  ansible.builtin.template:
     src: "ipsilon.conf"
     dest: "/etc/ipsilon/root/ipsilon.conf"
     owner: ipsilon
@@ -119,7 +119,7 @@
   - restart apache
 
 - name: Copy ipsilon admin configuration
-  template:
+  ansible.builtin.template:
     src: "configuration.conf"
     dest: "/etc/ipsilon/root/configuration.conf"
     owner: ipsilon
@@ -146,7 +146,7 @@
   - restart apache
 
 - name: Copy ipsilon httpd config
-  template:
+  ansible.builtin.template:
     src: "httpd.conf.j2"
     dest: /etc/ipsilon/root/idp.conf
   tags:
@@ -197,7 +197,7 @@
   - ipsilon
 
 - name: Copy saml2 metadata script
-  template:
+  ansible.builtin.template:
     src: prepare-saml2-metadata.py
     dest: /usr/local/bin/prepare-saml2-metadata
     owner: root
@@ -258,7 +258,7 @@
   - ipsilon
 
 - name: Copy SSSd configuration
-  template:
+  ansible.builtin.template:
     src: sssd.conf
     dest: /etc/sssd/sssd.conf
     owner: root
diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml
index a5132237c0..3208740b85 100644
--- a/roles/iscsi_client/tasks/main.yml
+++ b/roles/iscsi_client/tasks/main.yml
@@ -49,7 +49,7 @@
   - config
 
 - name: Setup initiatorname.iscsi
-  template: src=initiatorname.iscsi.j2 dest=/etc/iscsi/initiatorname.iscsi
+  ansible.builtin.template: src=initiatorname.iscsi.j2 dest=/etc/iscsi/initiatorname.iscsi
   tags:
   - config
 
diff --git a/roles/keepalived/tasks/main.yml b/roles/keepalived/tasks/main.yml
index 2bbf5623a0..8d6a864122 100644
--- a/roles/keepalived/tasks/main.yml
+++ b/roles/keepalived/tasks/main.yml
@@ -15,7 +15,7 @@
   - keepalived
 
 - name: Install keepalived template
-  template: src=keepalived.conf.j2 dest=/etc/keepalived/keepalived.conf
+  ansible.builtin.template: src=keepalived.conf.j2 dest=/etc/keepalived/keepalived.conf
   tags:
   - config
   - keepalived
diff --git a/roles/kerneltest/tasks/main.yml b/roles/kerneltest/tasks/main.yml
index add8b01a38..08131e01fd 100644
--- a/roles/kerneltest/tasks/main.yml
+++ b/roles/kerneltest/tasks/main.yml
@@ -22,7 +22,7 @@
   - kerneltest
 
 - name: Install all the configuration file of kerneltest
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.location }}/{{ item.file }}
             owner=apache group=apache mode=0600
   with_items:
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 1664d7c499..bfc4aaddf4 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -133,7 +133,7 @@
   - koji_builder
 
 - name: Configure flatpak-builder plugin
-  template: src=flatpak.conf dest=/etc/kojid/plugins/flatpak.conf
+  ansible.builtin.template: src=flatpak.conf dest=/etc/kojid/plugins/flatpak.conf
   vars:
     candidate_registry: "candidate-registry{{ env_suffix }}.fedoraproject.org"
   notify:
@@ -153,7 +153,7 @@
   - koji_builder
 
 - name: Build /etc/kojid/kojid.conf from group vars
-  template: src=kojid.conf dest=/etc/kojid/kojid.conf
+  ansible.builtin.template: src=kojid.conf dest=/etc/kojid/kojid.conf
   notify:
   - restart kojid
   tags:
@@ -167,7 +167,7 @@
   - koji_builder_osbuild
 
 - name: Build /etc/koji-osbuild/builder.conf
-  template: src=builder.conf{{env_suffix}} dest=/etc/koji-osbuild/builder.conf
+  ansible.builtin.template: src=builder.conf{{env_suffix}} dest=/etc/koji-osbuild/builder.conf
   notify:
   - restart kojid
   tags:
@@ -175,12 +175,12 @@
   - koji_builder_osbuild
 
 - name: Build /etc/koji/koji.conf from group vars
-  template: src=koji.conf dest=/etc/koji.conf
+  ansible.builtin.template: src=koji.conf dest=/etc/koji.conf
   tags:
   - koji_builder
 
 - name: Config for the kojid runroot plugin (only some builders)
-  template: src=runroot.conf.j2 dest=/etc/kojid/plugins/runroot.conf
+  ansible.builtin.template: src=runroot.conf.j2 dest=/etc/kojid/plugins/runroot.conf
   when: "'runroot' in group_names"
   notify:
   - restart kojid
@@ -219,7 +219,7 @@
 
 # oz.cfg  upstream ram and cpu definitions are not enough
 - name: Oz.cfg
-  template: src=oz.cfg.j2 dest=/etc/oz/oz.cfg
+  ansible.builtin.template: src=oz.cfg.j2 dest=/etc/oz/oz.cfg
   tags:
   - koji_builder
   - koji_builder/oz.cfg
@@ -278,7 +278,7 @@
   - koji_builder
 
 - name: Mock site-defaults.cfg
-  template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
+  ansible.builtin.template: src=builders/site-defaults.cfg dest=/etc/mock/site-defaults.cfg mode=0644 owner=root group=mock
   when: not inventory_hostname.startswith(('bkernel'))
   tags:
   - koji_builder
@@ -382,13 +382,13 @@
   - koji_builder/oomd
 
 - name: Install script to update osbuild api ip in the firewall
-  template: src=osbuildapi-update.sh dest=/usr/local/bin/osbuildapi-update.sh mode=755
+  ansible.builtin.template: src=osbuildapi-update.sh dest=/usr/local/bin/osbuildapi-update.sh mode=755
   tags:
   - koji_builder
   - koji_builder/osbuildapi
 
 - name: Install cron job to run osbuild api ip update script every minute.
-  template: src=osbuildapi-update.cron dest=/etc/cron.d/osbuildapi-update.cron mode=644
+  ansible.builtin.template: src=osbuildapi-update.cron dest=/etc/cron.d/osbuildapi-update.cron mode=644
   tags:
   - koji_builder
   - koji_builder/osbuildapi
@@ -406,7 +406,7 @@
   - koji_builder/nspawn
 
 - name: Create override config for systemd-nspawn containers to allow coredumps
-  template: src=nspawn-override.conf dest=/etc/systemd/system/machine-.scope.d/80-infra.conf mode=0644
+  ansible.builtin.template: src=nspawn-override.conf dest=/etc/systemd/system/machine-.scope.d/80-infra.conf mode=0644
   when: inventory_hostname.startswith(('buildhw-a64'))
   tags:
   - koji_builder
diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml
index e955659eac..0a46f18410 100644
--- a/roles/koji_hub/tasks/main.yml
+++ b/roles/koji_hub/tasks/main.yml
@@ -47,7 +47,7 @@
   - koji_hub
 
 - name: Fedmenu shim
-  template: src=fedmenu-extra-footer.html dest=/usr/share/koji-web/static/extra-footer.html
+  ansible.builtin.template: src=fedmenu-extra-footer.html dest=/usr/share/koji-web/static/extra-footer.html
   tags: koji_hub
   notify: reload httpd
   # XXX - we only want to do this in staging for now because it requires a patch
@@ -65,7 +65,7 @@
   - koji_hub
 
 - name: Hub config
-  template: src=hub.conf.j2 dest=/etc/koji-hub/hub.conf owner=apache group=apache mode=600
+  ansible.builtin.template: src=hub.conf.j2 dest=/etc/koji-hub/hub.conf owner=apache group=apache mode=600
   tags:
   - config
   - koji_hub
@@ -73,7 +73,7 @@
   notify: reload httpd
 
 - name: Kojiweb config
-  template: src=web.conf.j2 dest=/etc/kojiweb/web.conf owner=apache group=apache mode=600
+  ansible.builtin.template: src=web.conf.j2 dest=/etc/kojiweb/web.conf owner=apache group=apache mode=600
   tags:
   - config
   - koji_hub
@@ -110,7 +110,7 @@
   - fedora-messaging
 
 - name: Install the configuration file for fedora-messaging
-  template:
+  ansible.builtin.template:
     src=fedora-messaging.toml
     dest=/etc/fedora-messaging/config.toml
   tags:
@@ -281,7 +281,7 @@
   notify: reload httpd
 
 - name: Koji web hub specific config files
-  template: src={{ item }}.j2 dest=/etc/httpd/conf.d/{{ item }} owner=root group=root
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/httpd/conf.d/{{ item }} owner=root group=root
   with_items:
   - kojiweb.conf
   - kojihub.conf
@@ -313,7 +313,7 @@
   - kojira
 
 - name: Kojira config
-  template: src=kojira.conf.j2 dest=/etc/kojira/kojira.conf
+  ansible.builtin.template: src=kojira.conf.j2 dest=/etc/kojira/kojira.conf
   tags:
   - config
   - koji_hub
@@ -406,12 +406,12 @@
   when: ansible_hostname.startswith('koji02')
 
 - name: Install koji-gc.conf
-  template: src=koji-gc.conf.j2 dest=/etc/koji-gc/koji-gc.conf
+  ansible.builtin.template: src=koji-gc.conf.j2 dest=/etc/koji-gc/koji-gc.conf
   tags:
   - koji_hub
 
 - name: Install prune-signed-copies-protected-tags config for prunesigs
-  template: src=prune-signed-copies-protected-tags.j2 dest=/etc/prune-signed-copies-protected-tags
+  ansible.builtin.template: src=prune-signed-copies-protected-tags.j2 dest=/etc/prune-signed-copies-protected-tags
   tags:
   - koji_hub
 
diff --git a/roles/kojipkgs/tasks/main.yml b/roles/kojipkgs/tasks/main.yml
index 3c68b66d86..4e1dbea1a6 100644
--- a/roles/kojipkgs/tasks/main.yml
+++ b/roles/kojipkgs/tasks/main.yml
@@ -14,7 +14,7 @@
   - kojipkgs
 
 - name: Install apache config templates for local apache
-  template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644
+  ansible.builtin.template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }} owner=root group=root mode=644
   with_items:
   - kojipkgs.conf
   notify:
diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml
index c843c96f6b..b4944a6e48 100644
--- a/roles/letsencrypt/tasks/main.yml
+++ b/roles/letsencrypt/tasks/main.yml
@@ -141,7 +141,7 @@
     - certbot_addhost is defined
 
 - name: Install certificate bundle
-  template: >
+  ansible.builtin.template: >
     dest=/etc/pki/tls/certs/{{site_name}}.bundle.cert
     src=combined.j2
     owner=root
diff --git a/roles/log-detective-backup/tasks/main.yml b/roles/log-detective-backup/tasks/main.yml
index 795bb84c18..8b5513439b 100644
--- a/roles/log-detective-backup/tasks/main.yml
+++ b/roles/log-detective-backup/tasks/main.yml
@@ -26,7 +26,7 @@
     - log_detective_backup
 
 - name: Install the backup script
-  template:
+  ansible.builtin.template:
     src: backup.sh.j2
     dest: "{{ ld_backup_script }}"
     mode: '0755'
diff --git a/roles/logging/tasks/main.yml b/roles/logging/tasks/main.yml
index c17c1c1d86..3cee5a96e7 100644
--- a/roles/logging/tasks/main.yml
+++ b/roles/logging/tasks/main.yml
@@ -48,7 +48,7 @@
   - fedora-messaging
 
 - name: Install fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: fedora-messaging.toml.j2
     dest: /etc/fedora-messaging/config.toml
     owner: countme
diff --git a/roles/mariadb_server/tasks/main.yml b/roles/mariadb_server/tasks/main.yml
index 65a1967ede..e5e146384b 100644
--- a/roles/mariadb_server/tasks/main.yml
+++ b/roles/mariadb_server/tasks/main.yml
@@ -41,7 +41,7 @@
     check_implicit_admin: true
 
 - name: Create .my.cnf file for future logins
-  template: src=dotmy.cnf.j2 dest=/root/.my.cnf owner=root group=root mode=0700
+  ansible.builtin.template: src=dotmy.cnf.j2 dest=/root/.my.cnf owner=root group=root mode=0700
 
 - name: Ensure mariadb has a place to backup to
   ansible.builtin.file: dest=/backups state=directory owner=mysql
@@ -54,7 +54,7 @@
   - mariadb-server
 
 - name: Set up some cronjobs to backup databases as configured
-  template: >
+  ansible.builtin.template: >
     src=cron-backup-database
     dest=/etc/cron.d/cron-backup-database-{{ item }}
   with_items:
diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index 435b8df6e9..b3600bcc4c 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -121,7 +121,7 @@
   - fedora-messaging
 
 - name: Install fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: "fedora-messaging.toml"
     dest: /etc/fedora-messaging/config.toml
     owner: root
@@ -160,14 +160,14 @@
 #  - mediawiki
 
 - name: Install localsettings
-  template: src=LocalSettings.php.{{wikiname}}.j2 dest=/srv/web/{{wikiname}}-wiki/LocalSettings.php owner=apache group=apache mode=600 setype=httpd_sys_content_t
+  ansible.builtin.template: src=LocalSettings.php.{{wikiname}}.j2 dest=/srv/web/{{wikiname}}-wiki/LocalSettings.php owner=apache group=apache mode=600 setype=httpd_sys_content_t
   notify: reload httpd
   tags:
   - mediawiki
   - localsettings
 
 - name: Httpd conf
-  template: src=mediawiki-app.conf.j2 dest=/etc/httpd/conf.d/{{wikiname}}.conf
+  ansible.builtin.template: src=mediawiki-app.conf.j2 dest=/etc/httpd/conf.d/{{wikiname}}.conf
   notify: reload httpd
   tags:
   - mediawiki
diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml
index 088406a531..5a3fb451c9 100644
--- a/roles/memcached/tasks/main.yml
+++ b/roles/memcached/tasks/main.yml
@@ -6,7 +6,7 @@
   - memcached
 
 - name: Setup memcached sysconfig
-  template: src=memcached dest=/etc/sysconfig/memcached mode=644
+  ansible.builtin.template: src=memcached dest=/etc/sysconfig/memcached mode=644
   notify:
   - restart memcached
   tags:
diff --git a/roles/messaging/base/tasks/main.yml b/roles/messaging/base/tasks/main.yml
index 2046193d65..df561c4d20 100644
--- a/roles/messaging/base/tasks/main.yml
+++ b/roles/messaging/base/tasks/main.yml
@@ -43,8 +43,8 @@
   tags:
   - fedora-messaging
 
-- name: "Install the toml configuration file"
-  template: src="messaging.toml.j2" dest="/etc/fedora-messaging/{{ item.username }}.toml"
+- name: "install the toml configuration file"
+  ansible.builtin.template: src="messaging.toml.j2" dest="/etc/fedora-messaging/{{ item.username }}.toml"
             owner=root group=root mode=644
   vars:
   - msg_username: "{{ item.username }}"
diff --git a/roles/mirror_pagure_ansible/tasks/main.yml b/roles/mirror_pagure_ansible/tasks/main.yml
index e11a340c1d..9541ca4295 100644
--- a/roles/mirror_pagure_ansible/tasks/main.yml
+++ b/roles/mirror_pagure_ansible/tasks/main.yml
@@ -67,7 +67,7 @@
   - fedora-messaging
 
 - name: Setup mirror_pagure_ansible fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: mirror_pagure_ansible.cfg
     dest: /etc/fedora-messaging/mirror_pagure_ansible.toml
     owner: mirror_pagure_ansible
@@ -92,7 +92,7 @@
   - mirror_pagure_ansible
 
 - name: Install the consumer
-  template:
+  ansible.builtin.template:
     src: mirror_from_pagure_bus.py
     dest: /usr/local/libexec/mirror_pagure_ansible/mirror_from_pagure_bus.py
   tags:
@@ -103,7 +103,7 @@
 # Install and start the service
 
 - name: Install the dedicated service file for mirror_pagure_ansible
-  template:
+  ansible.builtin.template:
     src: mirror_pagure_ansible.service
     dest: /etc/systemd/system/mirror_pagure_ansible.service
     owner: root
diff --git a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
index 17a23b49e4..842c683699 100644
--- a/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist_proxy/tasks/main.yml
@@ -96,7 +96,7 @@
 # We deploy two service files. Both listen on a different port, so that we can switch
 # them out as part of the protobuf cache deployment without having any local downtime.
 - name: Deploy service files
-  template: src=mirrorlist.service.j2 dest=/etc/systemd/system/mirrorlist{{ item }}.service
+  ansible.builtin.template: src=mirrorlist.service.j2 dest=/etc/systemd/system/mirrorlist{{ item }}.service
   with_items:
   - 1
   - 2
diff --git a/roles/mote/tasks/main.yml b/roles/mote/tasks/main.yml
index d6ccb3a400..965b85688c 100644
--- a/roles/mote/tasks/main.yml
+++ b/roles/mote/tasks/main.yml
@@ -50,7 +50,7 @@
   - mote
 
 - name: Replace the mote configuration file by the one with the normal user
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest="{{ item.location }}/{{ item.file }}"
             owner=apache group=apache mode=0600
   with_items:
diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 9734e1234a..f8cefd3884 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -123,7 +123,7 @@
 
 # Set up our base config.
 - name: /etc/nagios/nrpe.cfg
-  template: src=nrpe.cfg.j2 dest=/etc/nagios/nrpe.cfg
+  ansible.builtin.template: src=nrpe.cfg.j2 dest=/etc/nagios/nrpe.cfg
   when: not inventory_hostname.startswith('noc0')
   notify:
   - restart nrpe
@@ -136,7 +136,7 @@
 # So when adding or modifying them change the .j2 version in git.
 #
 - name: Install nrpe client configs
-  template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
   - check_raid.cfg
   - check_ipa.cfg
@@ -176,7 +176,7 @@
 # So when adding or modifying them change the .j2 version in git.
 #
 - name: Install nrpe openvpn check config
-  template: src=check_openvpn_link.cfg.j2 dest=/etc/nrpe.d/check_openvpn_link.cfg owner=root group=root mode=0644
+  ansible.builtin.template: src=check_openvpn_link.cfg.j2 dest=/etc/nrpe.d/check_openvpn_link.cfg owner=root group=root mode=0644
   when: vpn == true
   notify:
   - restart nrpe
@@ -187,7 +187,7 @@
 # So when adding or modifying them change the .j2 version in git.
 #
 - name: Install nrpe merged log check script on log01
-  template: src=check_merged_file_age.cfg.j2 dest=/etc/nrpe.d/check_merged_file_age.cfg owner=root group=root mode=0644
+  ansible.builtin.template: src=check_merged_file_age.cfg.j2 dest=/etc/nrpe.d/check_merged_file_age.cfg owner=root group=root mode=0644
   when: inventory_hostname.startswith('log0')
   notify:
   - restart nrpe
@@ -198,7 +198,7 @@
 # So when adding or modifying them change the .j2 version in git.
 #
 - name: Install nrpe check_mysql config for mariadb servers
-  template: src=check_mysql.cfg.j2 dest=/etc/nrpe.d/check_mysql.cfg owner=root group=root mode=0644
+  ansible.builtin.template: src=check_mysql.cfg.j2 dest=/etc/nrpe.d/check_mysql.cfg owner=root group=root mode=0644
   when: inventory_hostname.startswith('db03')
   notify:
   - restart nrpe
@@ -206,7 +206,7 @@
   - nagios_client
 
 - name: Install nrpe checks for mailman01
-  template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
   - check_mailman_api.cfg
   when: inventory_hostname.startswith('mailman01')
@@ -216,7 +216,7 @@
   - nagios_client
 
 - name: Install nrpe checks for proxies
-  template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
   - check_happroxy_conns.cfg
   - check_varnish_proc.cfg
@@ -227,7 +227,7 @@
   - nagios_client
 
 - name: Install nrpe checks for sigul_bridge
-  template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
   - check_sigul_bridge_proc.cfg
   when: inventory_hostname.startswith('sign-bridge')
@@ -237,7 +237,7 @@
   - nagios_client
 
 - name: Install nrpe checks for sundries/websites
-  template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
+  ansible.builtin.template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
   - check_websites_buildtime.cfg
   when: inventory_hostname.startswith('sundries')
@@ -252,7 +252,7 @@
   - nagios_client
   block:
   - name: Install the nrpe template
-    template: src=check_crl_next_update.cfg.j2 dest=/etc/nrpe.d/check_crl_next_update.cfg owner=root group=root mode=0644
+    ansible.builtin.template: src=check_crl_next_update.cfg.j2 dest=/etc/nrpe.d/check_crl_next_update.cfg owner=root group=root mode=0644
     notify:
     - restart nrpe
 
@@ -263,7 +263,7 @@
     acl: default=no etype=user entity=nrpe permissions="r" name=/etc/openvpn/server/crl.pem state=present
 
 - name: Install nrpe config for the RabbitMQ checks
-  template:
+  ansible.builtin.template:
     src: "rabbitmq_args.ini.j2"
     dest: "/etc/nrpe.d/rabbitmq_args.ini"
     owner: root
@@ -274,7 +274,7 @@
   - nagios_client
 
 - name: Install nrpe checks for the RabbitMQ cluster
-  template:
+  ansible.builtin.template:
     src: "{{ item }}.j2"
     dest: "/etc/nrpe.d/{{ item }}"
     owner: root
@@ -301,7 +301,7 @@
   - nagios_client
 
 - name: Install nrpe check for rsyslogd
-  template:
+  ansible.builtin.template:
     src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
     - check_rsyslogd_proc.cfg
@@ -311,7 +311,7 @@
     - nagios_client
 
 - name: Install nrpe check for systemd units
-  template:
+  ansible.builtin.template:
     src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} owner=root group=root mode=0644
   with_items:
     - check_systemd_units.cfg
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index fa7816e6cf..b631c1a391 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -326,7 +326,7 @@
 # This one may go to being just a regular config file if we can make remote monitoring work
 ## Copy over system configs
 - name: Copy specialized nrpe.cfg for nagios server
-  template: src=nrpe/nrpe.cfg.j2 dest=/etc/nagios/nrpe.cfg
+  ansible.builtin.template: src=nrpe/nrpe.cfg.j2 dest=/etc/nagios/nrpe.cfg
   notify:
   - restart nrpe
   tags:
@@ -340,14 +340,14 @@
   - nagios_server
 
 - name: Template out the nagios httpd conf
-  template: src=httpd/{{item}}.j2 dest=/etc/httpd/conf.d/{{item}}
+  ansible.builtin.template: src=httpd/{{item}}.j2 dest=/etc/httpd/conf.d/{{item}}
   with_items:
   - nagios.conf
   tags:
   - nagios_server
 
 - name: Template out the nagios httpd conf
-  template: src=httpd/{{item}}.j2 dest=/etc/httpd/conf.d/{{item}}
+  ansible.builtin.template: src=httpd/{{item}}.j2 dest=/etc/httpd/conf.d/{{item}}
   with_items:
   - 0_nagios-external.conf
   tags:
@@ -356,21 +356,21 @@
   when: env == "production" and nagios_location == "external"
 
 - name: Template out the cgi.cfg
-  template: src=nagios/configs/cgi.cfg.j2 dest=/etc/nagios/cgi.cfg mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/configs/cgi.cfg.j2 dest=/etc/nagios/cgi.cfg mode=0644 owner=root group=root
   tags:
   - nagios_server
   - nagios_config
   notify: restart nagios
 
 - name: Override config.inc.php for the given environment
-  template: src=nagios/config.inc.php.j2 dest=/usr/share/nagios/html/config.inc.php mode=0640 owner=root group=apache
+  ansible.builtin.template: src=nagios/config.inc.php.j2 dest=/usr/share/nagios/html/config.inc.php mode=0640 owner=root group=apache
   tags:
   - nagios_server
   - nagios_config
   notify: restart nagios
 
 - name: Template over plugins
-  template: src=nagios/plugins/{{item}}.j2 dest=/usr/lib64/nagios/plugins/{{item}} mode=0755 owner=root group=root
+  ansible.builtin.template: src=nagios/plugins/{{item}}.j2 dest=/usr/lib64/nagios/plugins/{{item}} mode=0755 owner=root group=root
   with_items:
     - check_koji
   tags:
@@ -378,7 +378,7 @@
 
 
 - name: Template over commands
-  template: src=nagios/commands/{{item}}.j2 dest=/etc/nagios/commands/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/commands/{{item}}.j2 dest=/etc/nagios/commands/{{item}} mode=0644 owner=root group=root
   with_items:
     - postgres.cfg
   tags:
@@ -387,7 +387,7 @@
   notify: restart nagios
 
 - name: Template over services (internal)
-  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - ipa.cfg
     - mirrorlist-proxies.cfg
@@ -398,7 +398,7 @@
   notify: restart nagios
 
 - name: Template over services (both)
-  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - websites.cfg
   when: env == "production"
@@ -409,7 +409,7 @@
   notify: restart nagios
 
 - name: Build out nagios host templates (production)
-  template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
     - dedicatedsolutions-hosts.cfg
     - host1plus-hosts.cfg
@@ -431,7 +431,7 @@
 
 ## These are only available to the internal server
 - name: Build out nagios host templates (production)
-  template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
     - iad2-hosts.cfg
     - iad2-mgmt-hosts.cfg
@@ -444,7 +444,7 @@
   notify: restart nagios
 
 - name: Copy Matrix-Notify script
-  template: src=nagios/scripts/matrix-notify.sh.j2 dest=/usr/local/bin/matrix-notify.sh mode=0750 owner=root group=nagios
+  ansible.builtin.template: src=nagios/scripts/matrix-notify.sh.j2 dest=/usr/local/bin/matrix-notify.sh mode=0750 owner=root group=nagios
   tags:
   - nagios_config
   - nagios_server
@@ -452,7 +452,7 @@
 
 ## These are only available to the internal server
 - name: Build out nagios host templates (production)
-  template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
     - iad2-hosts.cfg
   when: env == "production" and nagios_location == 'iad2_internal'
@@ -463,7 +463,7 @@
   notify: restart nagios
 
 - name: Build out nagios host templates (production)
-  template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hosts/{{item}}.j2 dest=/etc/nagios/hosts/{{item}} mode=0644 owner=root group=root
   with_items:
     - iad2-external.cfg
     - ibiblio-hosts-ipv6.cfg
@@ -474,7 +474,7 @@
   notify: restart nagios
 
 - name: Build out nagios hostgroup templates (iad2)
-  template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root
   with_items:
     - all.cfg
     - vpnclients.cfg
@@ -490,7 +490,7 @@
   notify: restart nagios
 
 - name: Build out nagios hostgroup templates (external)
-  template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/hostgroups/{{item}}.j2 dest=/etc/nagios/hostgroups/{{item}} mode=0644 owner=root group=root
   with_items:
     - all-external.cfg
   when: nagios_location == "external"
@@ -501,7 +501,7 @@
   notify: restart nagios
 
 - name: Build out nagios services templates
-  template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
+  ansible.builtin.template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
     - iad2-mgmt.cfg
   when: nagios_location == 'iad2_internal'
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index 2a6800319c..5d7631d3e2 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -231,7 +231,7 @@
 # them, as we used to have for the fedmsg user. But for now they run
 # as root and use this one.
 - name: OpenQA client config
-  template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=root group=root mode=0640
+  ansible.builtin.template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=root group=root mode=0640
   tags:
   - config
 
@@ -239,7 +239,7 @@
   ansible.builtin.file: path=/etc/fedora-openqa state=directory owner=root group=root mode=0755
 
 - name: Write schedule.conf
-  template: src=schedule.conf.j2 dest=/etc/fedora-openqa/schedule.conf owner=root group=root mode=0600
+  ansible.builtin.template: src=schedule.conf.j2 dest=/etc/fedora-openqa/schedule.conf owner=root group=root mode=0600
   notify:
   - restart openqa consumers
   tags:
@@ -319,7 +319,7 @@
   - config
 
 - name: Configure fedora-messaging scheduler
-  template: src=fedora_openqa_scheduler.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_scheduler.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=fedora_openqa_scheduler.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_scheduler.toml owner=root group=root mode=0640
   notify:
   - restart openqa scheduler consumer
   when: "openqa_amqp_scheduler_queue is defined and openqa_amqp_scheduler_queue"
@@ -327,7 +327,7 @@
   - config
 
 - name: Configure fedora-messaging wiki reporter
-  template: src=fedora_openqa_wiki_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_wiki_reporter.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=fedora_openqa_wiki_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_wiki_reporter.toml owner=root group=root mode=0640
   notify:
   - restart openqa wiki consumer
   when: "openqa_amqp_wiki_reporter_queue is defined and openqa_amqp_wiki_reporter_queue"
@@ -335,7 +335,7 @@
   - config
 
 - name: Configure fedora-messaging ResultsDB reporter
-  template: src=fedora_openqa_resultsdb_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_resultsdb_reporter.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=fedora_openqa_resultsdb_reporter.toml.j2 dest=/etc/fedora-messaging/fedora_openqa_resultsdb_reporter.toml owner=root group=root mode=0640
   notify:
   - restart openqa resultsdb consumer
   when: "openqa_amqp_resultsdb_reporter_queue is defined and openqa_amqp_resultsdb_reporter_queue"
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 7a758838e0..36f9314d0c 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -203,7 +203,7 @@
     creates: /var/lib/openqa/share/factory/iso/fixed/cloudinit.iso
 
 - name: Create exports file
-  template: src=exports.j2 dest=/etc/exports.d/openqa.exports owner=root group=root mode=0644
+  ansible.builtin.template: src=exports.j2 dest=/etc/exports.d/openqa.exports owner=root group=root mode=0644
   register: exportsfile
   when: openqa_nfs_workers is defined
   tags:
@@ -218,14 +218,14 @@
   when: exportsfile is changed
 
 - name: Set up Apache config
-  template: src=openqa.conf.httpd.j2 dest=/etc/httpd/conf.d/openqa.conf owner=root group=root mode=0644
+  ansible.builtin.template: src=openqa.conf.httpd.j2 dest=/etc/httpd/conf.d/openqa.conf owner=root group=root mode=0644
   notify:
   - reload httpd
   tags:
   - config
 
 - name: OpenQA config
-  template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0644
+  ansible.builtin.template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0644
   tags:
   - config
 
@@ -244,7 +244,7 @@
   when: "openqa_dbhost is defined"
 
 - name: Database config
-  template: src=database.ini.pgsql.j2 dest=/etc/openqa/database.ini owner=geekotest group=root mode=0640
+  ansible.builtin.template: src=database.ini.pgsql.j2 dest=/etc/openqa/database.ini owner=geekotest group=root mode=0640
   when: "openqa_dbhost is defined"
   tags:
   - config
@@ -297,7 +297,7 @@
 # 0640 so we don't wind up ping-ponging it between server and
 # dispatcher roles.
 - name: OpenQA client config
-  template: src=client.conf.j2 dest=/etc/openqa/client.conf mode=0640
+  ansible.builtin.template: src=client.conf.j2 dest=/etc/openqa/client.conf mode=0640
   tags:
   - config
 
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index 842dc988c4..2bcb27a449 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -200,12 +200,12 @@
   when: openqa_tap
 
 - name: OpenQA client config
-  template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
+  ansible.builtin.template: src=client.conf.j2 dest=/etc/openqa/client.conf owner=_openqa-worker group=root mode=0600
   tags:
   - config
 
 - name: OpenQA worker config
-  template: src=workers.ini.j2 dest=/etc/openqa/workers.ini owner=_openqa-worker group=root mode=0644
+  ansible.builtin.template: src=workers.ini.j2 dest=/etc/openqa/workers.ini owner=_openqa-worker group=root mode=0644
   notify:
   - restart openqa workers
   tags:
diff --git a/roles/openqa/worker/tasks/nfs-client.yml b/roles/openqa/worker/tasks/nfs-client.yml
index 413757ac04..0b9bd6fca9 100644
--- a/roles/openqa/worker/tasks/nfs-client.yml
+++ b/roles/openqa/worker/tasks/nfs-client.yml
@@ -13,7 +13,7 @@
   ansible.builtin.file: path=/var/lib/openqa/share state=directory mode=0755
 
 - name: Create mount unit
-  template: src=var-lib-openqa-share.mount.j2 dest=/etc/systemd/system/var-lib-openqa-share.mount owner=root group=root mode=0644
+  ansible.builtin.template: src=var-lib-openqa-share.mount.j2 dest=/etc/systemd/system/var-lib-openqa-share.mount owner=root group=root mode=0644
   register: sharemount
   tags:
   - config
diff --git a/roles/openshift-apps/coreos-ci/tasks/main.yaml b/roles/openshift-apps/coreos-ci/tasks/main.yaml
index 19f8673e04..56889c4f12 100644
--- a/roles/openshift-apps/coreos-ci/tasks/main.yaml
+++ b/roles/openshift-apps/coreos-ci/tasks/main.yaml
@@ -10,7 +10,7 @@
 
 # generate the templates for project to be created
 - name: Create the templates
-  template:
+  ansible.builtin.template:
     src: "{{ item }}"
     dest: "/root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
     mode: "0770"
diff --git a/roles/openshift-apps/fedora-coreos-pipeline/tasks/main.yaml b/roles/openshift-apps/fedora-coreos-pipeline/tasks/main.yaml
index 94696dc72d..4e5c8cd45d 100644
--- a/roles/openshift-apps/fedora-coreos-pipeline/tasks/main.yaml
+++ b/roles/openshift-apps/fedora-coreos-pipeline/tasks/main.yaml
@@ -10,7 +10,7 @@
 
 # generate the templates for project to be created
 - name: Create the templates
-  template:
+  ansible.builtin.template:
     src: "{{ item }}"
     dest: "/root/ocp4/openshift-apps/{{project_name}}/{{ item }}"
     mode: "0770"
diff --git a/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml b/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml
index 854e61490e..83437a40f3 100644
--- a/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-buildconfig.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the buildconfig template
-  template:
-    src: "buildconfig.yml.j2"
+  ansible.builtin.template:
+    src: "buildconfig.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/buildconfig.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-cronjob.yml b/roles/openshift-apps/firmitas/tasks/create-cronjob.yml
index 75b6a45cfa..80f61077e1 100644
--- a/roles/openshift-apps/firmitas/tasks/create-cronjob.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-cronjob.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the cronjob template
-  template:
-    src: "cronjob.yml.j2"
+  ansible.builtin.template:
+    src: "cronjob.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/cronjob.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-deployment.yml b/roles/openshift-apps/firmitas/tasks/create-deployment.yml
index 8263f04a01..f00f9b2418 100644
--- a/roles/openshift-apps/firmitas/tasks/create-deployment.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-deployment.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the deployment template
-  template:
-    src: "deployment.yml.j2"
+  ansible.builtin.template:
+    src: "deployment.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/deployment.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml
index a69ba7dab2..7de1c2eb16 100644
--- a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml
@@ -35,8 +35,8 @@
 # Create the Secret from this file
 # generate the templates for project to be created
 - name: Copy the templates to the host
-  template:
-    src: "secret-configuration.yml.j2"
+  ansible.builtin.template:
+    src: "secret-configuration.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/secret-configuration.yml"
     mode: "0600"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-imagestream.yml b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml
index 2087d3026c..eca06ecad3 100644
--- a/roles/openshift-apps/firmitas/tasks/create-imagestream.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-imagestream.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the imagestream template
-  template:
-    src: "imagestream.yml.j2"
+  ansible.builtin.template:
+    src: "imagestream.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/imagestream.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-namespace.yml b/roles/openshift-apps/firmitas/tasks/create-namespace.yml
index 196e31bf65..7ddd909491 100644
--- a/roles/openshift-apps/firmitas/tasks/create-namespace.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-namespace.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the namespace template
-  template:
-    src: "namespace.yml.j2"
+  ansible.builtin.template:
+    src: "namespace.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/namespace.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml b/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml
index e606858925..6e0ac787c3 100644
--- a/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-pagure-apikey-secret.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the pagure api secret template
-  template:
-    src: "secret-pagure-apikey.yml.j2"
+  ansible.builtin.template:
+    src: "secret-pagure-apikey.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/secret-pagure-apikey.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml b/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml
index d799cce6f6..9fcd038bb9 100644
--- a/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml
+++ b/roles/openshift-apps/firmitas/tasks/create-persistent-volume-claim.yml
@@ -1,8 +1,8 @@
 ---
 # generate the templates for project to be created
 - name: Create the persistent volume template
-  template:
-    src: "persistent-volume-claim.yml.j2"
+  ansible.builtin.template:
+    src: "persistent-volume-claim.yml"
     dest: "/root/ocp4/openshift-apps/firmitas/persistent-volume-claim.yml"
     mode: "0770"
 
diff --git a/roles/openshift-apps/koschei/job/tasks/main.yml b/roles/openshift-apps/koschei/job/tasks/main.yml
index 6e1ba98ccf..45447749c6 100644
--- a/roles/openshift-apps/koschei/job/tasks/main.yml
+++ b/roles/openshift-apps/koschei/job/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Copy job template to a temporary file
-  template:
+  ansible.builtin.template:
     src: "{{roles_path}}/openshift-apps/{{job_app}}/templates/job.yml"
     dest: "/etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml"
 
diff --git a/roles/openshift/ipa-client/tasks/main.yml b/roles/openshift/ipa-client/tasks/main.yml
index d4f40957fe..f7175046e3 100644
--- a/roles/openshift/ipa-client/tasks/main.yml
+++ b/roles/openshift/ipa-client/tasks/main.yml
@@ -10,8 +10,8 @@
     ipa_ca_cert: "{{ ipa_ca_cert_var.content | b64decode }}"
 
 - name: Copy ipa config template to temporary file
-  template:
-    src: "{{roles_path}}/openshift/ipa-client/templates/configmap.yml.j2"
+  ansible.builtin.template:
+    src: "{{roles_path}}/openshift/ipa-client/templates/configmap.yml"
     dest: "/etc/openshift_apps/{{ipa_client_app}}/configmap-ipa-client.yml"
   register: ipa_config_result
 
diff --git a/roles/openshift/job/tasks/main.yml b/roles/openshift/job/tasks/main.yml
index bcdbe87469..d632f99f25 100644
--- a/roles/openshift/job/tasks/main.yml
+++ b/roles/openshift/job/tasks/main.yml
@@ -12,7 +12,7 @@
     fail_msg: "The 'job_command' variable is not defined"
 
 - name: Copy job template to a temporary file
-  template:
+  ansible.builtin.template:
     src: "{{roles_path}}/openshift-apps/{{job_app}}/templates/{{job_template}}"
     dest: "/etc/openshift_apps/{{job_app}}/job-{{job_name}}.yml"
 
diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml
index 4f03dee521..40139214fd 100644
--- a/roles/openshift/object/tasks/main.yml
+++ b/roles/openshift/object/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: Copy template {{object_template}} to temporary file ({{tmpfile.path}})
-  template: src={{roles_path}}/openshift-apps/{{object_app}}/templates/{{object_template}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}}
+  ansible.builtin.template: src={{roles_path}}/openshift-apps/{{object_app}}/templates/{{object_template}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}}
   when: object_template is defined
   register: object_template_result
 
 - name: Copy template {{object_template_fullpath}} to temporary file ({{tmpfile.path}})
-  template: src={{object_template_fullpath}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}}
+  ansible.builtin.template: src={{object_template_fullpath}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}}
   when: object_template_fullpath is defined and object_template is not defined
   register: object_template_fullpath_result
 
diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml
index 40e1069ff8..06fb98add5 100644
--- a/roles/openshift/project/tasks/main.yml
+++ b/roles/openshift/project/tasks/main.yml
@@ -14,8 +14,8 @@
   changed_when: "'not found' in project_exists.stderr"
 
 - name: Copy project template
-  template:
-    src="{{roles_path}}/openshift/project/templates/project.yml.j2"
+  ansible.builtin.template:
+    src="{{roles_path}}/openshift/project/templates/project.yml"
     dest=/etc/openshift_apps/{{project_app}}/project.yml
 
 - name: Create project
diff --git a/roles/openshift/secret-file/tasks/main.yml b/roles/openshift/secret-file/tasks/main.yml
index 735ec0c42f..7578a92b9c 100644
--- a/roles/openshift/secret-file/tasks/main.yml
+++ b/roles/openshift/secret-file/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Copy template {{secret_file_template}}
-  template: src={{roles_path}}/openshift-apps/{{secret_file_app}}/templates/{{secret_file_template}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}}
+  ansible.builtin.template: src={{roles_path}}/openshift-apps/{{secret_file_app}}/templates/{{secret_file_template}} dest=/etc/openshift_apps/{{os_app}}/{{secret_file_key}}
   when: secret_file_template is defined
   register: secret_template
 
diff --git a/roles/openshift/sysadmin-openshift/tasks/resources.yaml b/roles/openshift/sysadmin-openshift/tasks/resources.yaml
index f78787de32..05a1b04dce 100644
--- a/roles/openshift/sysadmin-openshift/tasks/resources.yaml
+++ b/roles/openshift/sysadmin-openshift/tasks/resources.yaml
@@ -12,7 +12,7 @@
 
 # generate the templates for project to be created
 - name: Create the templates
-  template:
+  ansible.builtin.template:
     src: "{{ item }}"
     dest: "/root/ocp4/openshift-apps/{{sysadmin_openshift_project_name}}/{{ item }}"
     mode: "0770"
diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index 8afd6cfc9c..2fd281e356 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -11,7 +11,7 @@
   - openvpn
 
 - name: Install main config file
-  template: src=client.conf
+  ansible.builtin.template: src=client.conf
             dest=/etc/openvpn/client/openvpn.conf
             owner=root group=root mode=0644
   tags:
diff --git a/roles/packages3/web/tasks/main.yml b/roles/packages3/web/tasks/main.yml
index 2a1ab647a6..f023f31d4b 100644
--- a/roles/packages3/web/tasks/main.yml
+++ b/roles/packages3/web/tasks/main.yml
@@ -34,7 +34,7 @@
   - packages/web
 
 - name: Copy over the app config
-  template: >
+  ansible.builtin.template: >
     src=packages-app.ini.j2
     dest=/etc/fedoracommunity/production.ini
     owner=apache group=fedmsg mode=0440
@@ -57,7 +57,7 @@
   - packages/web
 
 - name: Copy over the fedmsg consumer config
-  template: >
+  ansible.builtin.template: >
     src=fedoracommunity.py
     dest=/etc/fedmsg.d/fedoracommunity.py
     owner=root group=root mode=644
diff --git a/roles/pagure/tasks/main.yml b/roles/pagure/tasks/main.yml
index 84cb2eee90..e42255d0f2 100644
--- a/roles/pagure/tasks/main.yml
+++ b/roles/pagure/tasks/main.yml
@@ -103,7 +103,7 @@
   when: env == 'pagure-staging'
 
 - name: Put in robots.txt
-  template: src=robots.txt.j2 dest=/var/www/html/robots.txt
+  ansible.builtin.template: src=robots.txt.j2 dest=/var/www/html/robots.txt
   tags:
   - pagure
 
@@ -237,7 +237,7 @@
   - stunnel
 
 - name: Install stunnel.conf
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.dest }}
             owner=root group=root mode=0600
   with_items:
@@ -279,7 +279,7 @@
   - fedora-messaging
 
 - name: Install the configuration file for fedora-messaging
-  template:
+  ansible.builtin.template:
     src=fedora-messaging.toml
     dest=/etc/fedora-messaging/config.toml
   tags:
@@ -357,7 +357,7 @@
   - web
 
 - name: Copy sundry pagure configuration
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.location }}/{{ item.file }}
             owner=git group=postfix mode=0640
   with_items:
@@ -371,7 +371,7 @@
   - restart apache
 
 - name: Install client_secrets for ipsilon
-  template: src=client_secrets.json
+  ansible.builtin.template: src=client_secrets.json
             dest=/etc/pagure
             owner=git group=postfix mode=0640
   tags:
@@ -390,7 +390,7 @@
   - pagure
 
 - name: Install the configuration file to activate https
-  template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }}
+  ansible.builtin.template: src={{ item }} dest=/etc/httpd/conf.d/{{ item }}
             owner=root group=root mode=0644
   with_items:
   - 0_pagure.conf
@@ -404,7 +404,7 @@
   - restart apache
 
 - name: Install the wsgi file
-  template: src={{ item }}
+  ansible.builtin.template: src={{ item }}
             dest=/var/www/{{ item }}
             owner=git group=git mode=0644
   with_items:
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index d1343d30ba..40b3857f32 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -18,7 +18,7 @@
   - people
 
 - name: Install main httpd config
-  template: src=people.conf dest=/etc/httpd/conf.d/people.conf
+  ansible.builtin.template: src=people.conf dest=/etc/httpd/conf.d/people.conf
   tags:
   - people
   - sslciphers
@@ -296,7 +296,7 @@
   - people
 
 - name: Copy SSSd configuration
-  template:
+  ansible.builtin.template:
     src: sssd.conf
     dest: /etc/sssd/sssd.conf
     owner: root
diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml
index 22669bbca8..7bcc3ae481 100644
--- a/roles/planet/tasks/main.yml
+++ b/roles/planet/tasks/main.yml
@@ -31,7 +31,7 @@
     - planet_server
 
 - name: Copy the planet http config file
-  template: src=planet.conf dest=/etc/httpd/conf.d/planet.conf
+  ansible.builtin.template: src=planet.conf dest=/etc/httpd/conf.d/planet.conf
   tags:
     - planet_server
     - sslciphers
@@ -335,7 +335,7 @@
   - planet_server
 
 - name: Install fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: fedora-messaging.toml.j2
     dest: /etc/fedora-messaging/config.toml
     owner: planet-user
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index c7ddc128c0..f05bf40602 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -105,7 +105,7 @@
   - postgresql
 
 - name: Postgresql config template (el7 / postgresql 9.2)
-  template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf
+  ansible.builtin.template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf
   when: ansible_distribution_major_version|int < 8 and ansible_distribution == 'RedHat'
   notify:
   - restart postgresql
@@ -114,7 +114,7 @@
   - postgresql
 
 - name: Postgresql config template (Fedora / el8 / postgresql 12)
-  template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf-12
+  ansible.builtin.template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf-12
   when: (ansible_distribution_major_version|int == 8 and ansible_distribution == 'RedHat') or ansible_distribution != 'RedHat'
   notify:
   - restart postgresql
@@ -123,7 +123,7 @@
   - postgresql
 
 - name: Postgresql config template (el9 / postgresql 15)
-  template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf-15
+  ansible.builtin.template: dest=/var/lib/pgsql/data/postgresql.conf src=postgresql.conf-15
   when: (ansible_distribution_major_version|int == 9 and ansible_distribution == 'RedHat')
   notify:
   - restart postgresql
@@ -167,7 +167,7 @@
   when: inventory_hostname.startswith('db01.iad2')
 
 - name: Set up some cronjobs to backup databases as configured
-  template: >
+  ansible.builtin.template: >
     src=cron-backup-database
     dest=/etc/cron.d/cron-backup-database-{{ item }}
   with_items:
diff --git a/roles/rabbit/queue/tasks/main.yml b/roles/rabbit/queue/tasks/main.yml
index d0c24e8d1a..801be99e5a 100644
--- a/roles/rabbit/queue/tasks/main.yml
+++ b/roles/rabbit/queue/tasks/main.yml
@@ -101,7 +101,7 @@
 - name: Monitor the {{ queue_name }} queue in Nagios (NRPE)
   when: queue_thresholds and env == "production"
   delegate_to: "{{ queue_rabbitmq_server }}"
-  template:
+  ansible.builtin.template:
     src: nrpe.cfg.j2
     dest: /etc/nrpe.d/check_rabbitmq_queue_{{ queue_name }}.cfg
     owner: root
@@ -115,7 +115,7 @@
 - name: Monitor the {{ queue_name }} queue in Nagios
   when: queue_thresholds and env == "production"
   delegate_to: "{{ queue_nagios_server }}"
-  template:
+  ansible.builtin.template:
     src: nagios.cfg.j2
     dest: /etc/nagios/services/rabbitmq-queue-{{ queue_name }}.cfg
 #  notify: restart nagios on noc
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 89a3ad0ceb..a5e67605da 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -66,7 +66,7 @@
   - config
 
 - name: Deploy configuration
-  template: src={{item}} dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644
+  ansible.builtin.template: src={{item}} dest=/etc/rabbitmq/{{item}} owner=root group=root mode=0644
   with_items:
   - rabbitmq.config
   - rabbitmq-env.conf
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index c51c04b25f..c43f5dbadd 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -206,20 +206,20 @@
   - config
 
 - name: Write python-bugzilla configuration file
-  template: src=bugzillarc.j2 dest=/root/.config/python-bugzilla/bugzillarc owner=root group=root mode=0600
+  ansible.builtin.template: src=bugzillarc.j2 dest=/root/.config/python-bugzilla/bugzillarc owner=root group=root mode=0600
   when: "relvalconsumer_bugzilla_api_key is defined"
   tags:
   - config
 
 - name: Configure fedora-messaging relvalconsumer
-  template: src=relvalconsumer.toml.j2 dest=/etc/fedora-messaging/relvalconsumer.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=relvalconsumer.toml.j2 dest=/etc/fedora-messaging/relvalconsumer.toml owner=root group=root mode=0640
   notify:
   - restart relvalconsumer
   tags:
   - config
 
 - name: Configure fedora-messaging relvalamiconsumer
-  template: src=relvalamiconsumer.toml.j2 dest=/etc/fedora-messaging/relvalamiconsumer.toml owner=root group=root mode=0640
+  ansible.builtin.template: src=relvalamiconsumer.toml.j2 dest=/etc/fedora-messaging/relvalamiconsumer.toml owner=root group=root mode=0640
   notify:
   - restart relvalamiconsumer
   tags:
diff --git a/roles/review-stats/proxy/tasks/main.yml b/roles/review-stats/proxy/tasks/main.yml
index 6944aab64d..57f9c5f87c 100644
--- a/roles/review-stats/proxy/tasks/main.yml
+++ b/roles/review-stats/proxy/tasks/main.yml
@@ -6,7 +6,7 @@
   - review-stats/proxy
 
 - name: Put the proxy config in place
-  template: >
+  ansible.builtin.template: >
     src=review-stats.conf
     dest=/etc/httpd/conf.d/{{website}}/review-stats.conf
     owner=root group=root mode=0644
diff --git a/roles/rkhunter/tasks/main.yml b/roles/rkhunter/tasks/main.yml
index c511812b60..deda9afae5 100644
--- a/roles/rkhunter/tasks/main.yml
+++ b/roles/rkhunter/tasks/main.yml
@@ -8,7 +8,7 @@
   - packages
 
 - name: Rkhunter.conf
-  template: src=rkhunter.conf.j2 dest=/etc/rkhunter.conf mode=0640
+  ansible.builtin.template: src=rkhunter.conf.j2 dest=/etc/rkhunter.conf mode=0640
   notify:
   - run rkhunter
   tags:
diff --git a/roles/robosignatory/tasks/main.yml b/roles/robosignatory/tasks/main.yml
index 1fd9c76176..23e141a41e 100644
--- a/roles/robosignatory/tasks/main.yml
+++ b/roles/robosignatory/tasks/main.yml
@@ -79,7 +79,7 @@
     recurse: yes
 
 - name: Install koji config
-  template:
+  ansible.builtin.template:
     src: koji.conf
     dest: /etc/robosignatory/koji.config
     owner: robosignatory
@@ -153,7 +153,7 @@
   - robosignatory
 
 - name: Setup robosignatory config
-  template:
+  ansible.builtin.template:
     src: robosignatory.toml.j2
     dest: /etc/fedora-messaging/robosignatory.toml
     owner: robosignatory
diff --git a/roles/rsnapshot-push/tasks/main.yml b/roles/rsnapshot-push/tasks/main.yml
index f989a07ad6..b92f892444 100644
--- a/roles/rsnapshot-push/tasks/main.yml
+++ b/roles/rsnapshot-push/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Backup script
-  template:
+  ansible.builtin.template:
     src: client-backup-script.sh.j2
     dest: "/usr/local/bin/{{ item.value.command }}"
     owner: "{{ item.value.user }}"
@@ -30,7 +30,7 @@
   tags: rsnapshot_push
 
 - name: Server-side custom rsnapshot daemon script
-  template:
+  ansible.builtin.template:
     src: server-daemon.sh.j2
     dest: "{{ '/'.join([rsnapshot_push.backup_dir, item.key, 'sync-daemon']) }}"
     owner: "{{ item.value.user }}"
@@ -53,7 +53,7 @@
   tags: rsnapshot_push
 
 - name: Rsnapshot call wrapper
-  template:
+  ansible.builtin.template:
     src: server-rsnapshot.py.j2
     dest: "{{ '/'.join([rsnapshot_push.backup_dir, item.key, 'rsnapshot']) }}"
     owner: "{{ item.value.user }}"
diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml
index 1ef61b98fc..6d283b7caa 100644
--- a/roles/rsyncd/tasks/main.yml
+++ b/roles/rsyncd/tasks/main.yml
@@ -55,7 +55,7 @@
   - rsyncd
 
 - name: Rsyncd.conf file for download servers
-  template: src=rsyncd.conf.download.j2 dest=/etc/rsyncd.conf mode=0644
+  ansible.builtin.template: src=rsyncd.conf.download.j2 dest=/etc/rsyncd.conf mode=0644
   notify:
   - restart daemon
   when: "'download' in group_names"
diff --git a/roles/sigul/bridge/tasks/main.yml b/roles/sigul/bridge/tasks/main.yml
index c32878891d..7e8a3be1e5 100644
--- a/roles/sigul/bridge/tasks/main.yml
+++ b/roles/sigul/bridge/tasks/main.yml
@@ -7,7 +7,7 @@
   - sigul/bridge
 
 - name: Setup sigul bridge.conf
-  template: src=bridge.conf.j2 dest=/etc/sigul/bridge.conf
+  ansible.builtin.template: src=bridge.conf.j2 dest=/etc/sigul/bridge.conf
             owner=sigul group=sigul mode=0640
   tags:
   - config
@@ -15,7 +15,7 @@
   - sigul/bridge
 
 - name: Setup primary koji config file
-  template: src=koji-primary.conf.j2 dest=/etc/koji-primary.conf owner=root group=root mode=644
+  ansible.builtin.template: src=koji-primary.conf.j2 dest=/etc/koji-primary.conf owner=root group=root mode=644
   when: inventory_hostname.startswith('sign')
   tags:
   - sigul
diff --git a/roles/sigul/server/tasks/main.yml b/roles/sigul/server/tasks/main.yml
index 76447e5ef1..357b4b5c71 100644
--- a/roles/sigul/server/tasks/main.yml
+++ b/roles/sigul/server/tasks/main.yml
@@ -52,7 +52,7 @@
   - packages
 
 - name: Setup sigul server.conf
-  template: src=server.conf.j2 dest=/etc/sigul/server.conf
+  ansible.builtin.template: src=server.conf.j2 dest=/etc/sigul/server.conf
             owner=sigul group=sigul mode=0640
   tags:
   - config
diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml
index 6d91fdc943..0110bc205d 100644
--- a/roles/supybot/tasks/main.yml
+++ b/roles/supybot/tasks/main.yml
@@ -151,7 +151,7 @@
   - config
 
 - name: Install fedora-messaging config
-  template:
+  ansible.builtin.template:
     src: fedora-messaging.toml.j2
     dest: /etc/fedora-messaging/{{ botname }}.toml
     owner: daemon
diff --git a/roles/testcase_stats/tasks/main.yml b/roles/testcase_stats/tasks/main.yml
index cc8320853c..6d87217e3e 100644
--- a/roles/testcase_stats/tasks/main.yml
+++ b/roles/testcase_stats/tasks/main.yml
@@ -30,7 +30,7 @@
   - packages
 
 - name: Deploy the cronjob
-  template: src=testcase_stats.cron dest=/etc/cron.hourly/testcase_stats owner=root group=root mode=0755
+  ansible.builtin.template: src=testcase_stats.cron dest=/etc/cron.hourly/testcase_stats owner=root group=root mode=0755
 
 - name: Set up Apache config
   ansible.builtin.copy: src=testcase_stats.conf.httpd dest=/etc/httpd/conf.d/01-testcase_stats.conf owner=root group=root mode=0644
diff --git a/roles/testdays/tasks/main.yml b/roles/testdays/tasks/main.yml
index 502323529a..7d5d1c6bc8 100644
--- a/roles/testdays/tasks/main.yml
+++ b/roles/testdays/tasks/main.yml
@@ -23,11 +23,11 @@
   seboolean: name=httpd_can_network_connect_db persistent=yes state=yes
 
 - name: Generate testdays config
-  template: src=settings.py.j2 dest=/etc/testdays/settings.py owner=root group=root mode=0644
+  ansible.builtin.template: src=settings.py.j2 dest=/etc/testdays/settings.py owner=root group=root mode=0644
   notify:
     - reload httpd
 
 - name: Generate testdays apache config
-  template: src=testdays.conf.j2 dest=/etc/httpd/conf.d/testdays.conf owner=root group=root mode=0644
+  ansible.builtin.template: src=testdays.conf.j2 dest=/etc/httpd/conf.d/testdays.conf owner=root group=root mode=0644
   notify:
     - reload httpd
diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml
index bce712fd2b..8467bfa78f 100644
--- a/roles/tftp_server/tasks/main.yml
+++ b/roles/tftp_server/tasks/main.yml
@@ -54,7 +54,7 @@
   when: datacenter == 'iad2'
 
 # - name: Generate custom configs
-#   template: src=grubhost.cfg.j2 dest="/var/lib/tftpboot/uefi/{{ hostvars[item].install_mac }}"
+#   ansible.builtin.template: src=grubhost.cfg.j2 dest="/var/lib/tftpboot/uefi/{{ hostvars[item].install_mac }}"
 #   with_items: "{{ groups['all'] }}"
 #   when: "hostvars[item].install_noc == inventory_hostname"
 #   tags:
diff --git a/roles/varnish/tasks/main.yml b/roles/varnish/tasks/main.yml
index 7ac7da2646..ee1d42dcf8 100644
--- a/roles/varnish/tasks/main.yml
+++ b/roles/varnish/tasks/main.yml
@@ -23,7 +23,7 @@
   - selinux
 
 - name: Install varnish /etc/systemd/system/varnish.service file (fedora 29+)
-  template: src=varnish.f29.j2 dest=/etc/systemd/system/varnish.service owner=root group=root
+  ansible.builtin.template: src=varnish.f29.j2 dest=/etc/systemd/system/varnish.service owner=root group=root
   notify:
   - reload systemd
   - restart varnish
@@ -32,7 +32,7 @@
   when: ansible_distribution_major_version|int >= 29 and ansible_distribution == 'Fedora'
 
 - name: Install /etc/varnish/default.vcl (proxies)
-  template: src={{ varnish_group }}.vcl.j2 dest=/etc/varnish/default.vcl owner=root group=root
+  ansible.builtin.template: src={{ varnish_group }}.vcl.j2 dest=/etc/varnish/default.vcl owner=root group=root
   notify:
   - restart varnish
   tags:
diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml
index de24f0b201..7f1ba74798 100644
--- a/roles/web-data-analysis/tasks/main.yml
+++ b/roles/web-data-analysis/tasks/main.yml
@@ -185,7 +185,7 @@
     - cron
 
 - name: Write configuration file for script to sync httpd logs
-  template:
+  ansible.builtin.template:
     src: sync-http-logs.yaml.j2
     dest: /etc/sync-http-logs.yaml
   when: inventory_hostname.startswith('log01')
diff --git a/roles/weblate-backup/tasks/main.yml b/roles/weblate-backup/tasks/main.yml
index 3eb4934358..9ea6bc735c 100644
--- a/roles/weblate-backup/tasks/main.yml
+++ b/roles/weblate-backup/tasks/main.yml
@@ -44,7 +44,7 @@
   - weblate_backup
 
 - name: Install backup script
-  template:
+  ansible.builtin.template:
     src: weblate-backup
     dest: /usr/local/bin/weblate-backup
     owner: root
@@ -54,7 +54,7 @@
   - weblate_backup
 
 - name: Setup cron job
-  template:
+  ansible.builtin.template:
     src: cron-weblate-backup
     dest: /etc/cron.d/cron-weblate-backup
     owner: root
diff --git a/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml
index dce43393f1..09250885a4 100644
--- a/roles/yubikey/tasks/main.yml
+++ b/roles/yubikey/tasks/main.yml
@@ -11,7 +11,7 @@
   - packages
 
 - name: Install /etc/ykksm/ykksm-config.php and /etc/ykval/ykval-config.php
-  template: src={{ item.file }}
+  ansible.builtin.template: src={{ item.file }}
             dest={{ item.dest }}
             owner=apache group=apache mode=0640
   with_items:
diff --git a/roles/zabbix/zabbix_agent/tasks/main.yml b/roles/zabbix/zabbix_agent/tasks/main.yml
index cb4db30d83..7cfabb36a6 100644
--- a/roles/zabbix/zabbix_agent/tasks/main.yml
+++ b/roles/zabbix/zabbix_agent/tasks/main.yml
@@ -57,7 +57,7 @@
     - zabbix_agent
 
 - name: Configuring Zabbix agentd
-  template:
+  ansible.builtin.template:
     src: zabbix_agentd.conf.j2
     dest: "{{ zabbix_agentd }}"
   notify: restart_zabbix_agent
@@ -97,7 +97,7 @@
     - zabbix_agent
 
 - name: Adding some other conf files under zabbix_agentd.d
-  template:
+  ansible.builtin.template:
     src: "{{ item }}.j2"
     dest: "{{ zabbix_agentd_dir }}/{{ item }}"
     owner: zabbix
diff --git a/roles/zanata/tasks/main.yml b/roles/zanata/tasks/main.yml
index abaacd2b9d..78fbd6902c 100644
--- a/roles/zanata/tasks/main.yml
+++ b/roles/zanata/tasks/main.yml
@@ -18,7 +18,7 @@
   - zanata
 
 - name: Zanata auth config
-  template: >
+  ansible.builtin.template: >
     src=zanata.ini dest=/var/lib/zanata/.config/zanata.ini owner=apache group=apache
     mode=0600
   tags:
diff --git a/tasks/motd.yml b/tasks/motd.yml
index 5963d8c4ed..9715b24df6 100644
--- a/tasks/motd.yml
+++ b/tasks/motd.yml
@@ -1,6 +1,6 @@
 ---
 - name: Add motd to system
-  template: src=/srv/web/infra/hosts/motd.j2 dest=/etc/motd
+  ansible.builtin.template: src=/srv/web/infra/hosts/motd.j2 dest=/etc/motd
   tags:
   - motd
   - base
diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml
index 6b8ed837b5..4ef95469b4 100644
--- a/tasks/yumrepos.yml
+++ b/tasks/yumrepos.yml
@@ -77,7 +77,7 @@
   - yumrepos
 
 - name: Put fedora repos on primary architecture systems
-  template: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
+  ansible.builtin.template: src="{{ files }}/common/{{ item }}" dest="/etc/yum.repos.d/{{ item }}"
   with_items:
   - fedora.repo
   - fedora-updates.repo
@@ -89,7 +89,7 @@
   - yumrepos
 
 - name: Put fedora repos on secondary architecture systems
-  template: src="{{ files }}/common/{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item }}"
+  ansible.builtin.template: src="{{ files }}/common/{{ item }}-secondary" dest="/etc/yum.repos.d/{{ item }}"
   with_items:
   - fedora.repo
   - fedora-updates.repo