diff --git a/cups/tasks/main.yml b/cups/tasks/main.yml
index 749da9d..0c76e33 100644
--- a/cups/tasks/main.yml
+++ b/cups/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: cups-client
     state: installed
 
 - name: create config directory
-  file:
+  ansible.builtin.file:
     path: /etc/cups
     state: directory
     mode: 0755
@@ -13,7 +13,7 @@
     group: "{{ ansible_wheel }}"
 
 - name: create config
-  copy:
+  ansible.builtin.copy:
     dest: /etc/cups/client.conf
     content: |
       ServerName print.{{ mail_domain }}:443
diff --git a/epel_repo/tasks/main.yml b/epel_repo/tasks/main.yml
index 2ff3093..76d8863 100644
--- a/epel_repo/tasks/main.yml
+++ b/epel_repo/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 - name: check support
-  fail:
+  ansible.builtin.fail:
     msg: Role not supported in your system
   when: ansible_os_family != "RedHat"
 
 - name: enable epel repository
-  package:
+  ansible.builtin.package:
     name: epel-release
     state: installed
diff --git a/firefox/tasks/main.yml b/firefox/tasks/main.yml
index 13df85e..4bb064f 100644
--- a/firefox/tasks/main.yml
+++ b/firefox/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: firefox
     state: installed
 
 - name: create preferences directory
-  file:
+  ansible.builtin.file:
     path: /usr/lib64/firefox/defaults/preferences
     state: directory
     mode: 0755
@@ -13,7 +13,7 @@
     group: "{{ ansible_wheel }}"
 
 - name: install default settings
-  copy:
+  ansible.builtin.copy:
     dest: /usr/lib64/firefox/defaults/preferences/00-foo.sh.js
     src: foo.sh.js
     mode: 0644
diff --git a/git/tasks/main.yml b/git/tasks/main.yml
index b14c78f..7bf757a 100644
--- a/git/tasks/main.yml
+++ b/git/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 
 - name: install git packages
-  package:
+  ansible.builtin.package:
     name: git
     state: installed
 
 - name: create git config for sh based shells
-  template:
+  ansible.builtin.template:
     dest: /etc/profile.d/git.sh
     src: git.sh.j2
     mode: 0644
@@ -14,7 +14,7 @@
     group: root
 
 - name: create git config for csh based shells
-  template:
+  ansible.builtin.template:
     dest: /etc/profile.d/git.csh
     src: git.csh.j2
     mode: 0644
diff --git a/google_chrome/tasks/main.yml b/google_chrome/tasks/main.yml
index d5f65af..042e44c 100644
--- a/google_chrome/tasks/main.yml
+++ b/google_chrome/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: enable google chrome repository
-  yum_repository:
+  ansible.builtin.yum_repository:
     name: google-chrome
     baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64
     description: Google Chrome
@@ -9,12 +9,12 @@
     enabled: true
 
 - name: "install google chrome"
-  package:
+  ansible.builtin.package:
     name: google-chrome-stable
     state: present
 
 - name: "create google chrome policy directories"
-  file:
+  ansible.builtin.file:
     path: "{{ item }}"
     state: directory
     mode: 0755
@@ -25,7 +25,7 @@
     - /etc/opt/chrome/policies/recommended
 
 - name: "install google chrome managed settings"
-  copy:
+  ansible.builtin.copy:
     dest: /etc/opt/chrome/policies/managed/foo.sh.json
     src: managed.json
     mode: 0644
@@ -33,7 +33,7 @@
     group: root
 
 - name: "install google chrome recommended settings"
-  copy:
+  ansible.builtin.copy:
     dest: /etc/opt/chrome/policies/recommended/foo.sh.json
     src: recommended.json
     mode: 0644
@@ -41,7 +41,7 @@
     group: root
 
 - name: install custom chrome startup scripts
-  copy:
+  ansible.builtin.copy:
     dest: "/usr/local/bin/{{ item }}"
     src: "{{ item }}.sh"
     mode: 0755
diff --git a/kerberos/tasks/main.yml b/kerberos/tasks/main.yml
index b665f4f..3d18502 100644
--- a/kerberos/tasks/main.yml
+++ b/kerberos/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install kerberos client packages
-  package:
+  ansible.builtin.package:
     name: krb5-workstation
     state: installed
 
 - name: configure kerberos client
-  template:
+  ansible.builtin.template:
     dest: /etc/krb5.conf.d/realm.conf
     src: realm.conf.j2
     mode: 0644
diff --git a/ldap/tasks/main.yml b/ldap/tasks/main.yml
index b45dcdb..17ad3e4 100644
--- a/ldap/tasks/main.yml
+++ b/ldap/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: openldap-clients
     state: installed
 
 - name: configure ldap client
-  template:
+  ansible.builtin.template:
     dest: /etc/openldap/ldap.conf
     src: ldap.conf.j2
     mode: 0644
@@ -14,7 +14,7 @@
     group: "{{ ansible_wheel }}"
 
 - name: authenticate to ldap with host certs when running as root
-  template:
+  ansible.builtin.template:
     dest: /root/.ldaprc
     src: ldaprc.j2
     mode: 0600
diff --git a/lynx/tasks/main.yml b/lynx/tasks/main.yml
index bc5182f..98d9e57 100644
--- a/lynx/tasks/main.yml
+++ b/lynx/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: lynx
     state: installed
 
 - name: create site configuration
-  copy:
+  ansible.builtin.copy:
     dest: /etc/lynx-site.cfg
     src: lynx-site.cfg
     mode: 0644
@@ -13,7 +13,7 @@
     group: "{{ ansible_wheel }}"
 
 - name: install html2text script
-  copy:
+  ansible.builtin.copy:
     dest: /usr/local/bin/html2text
     src: html2text.sh
     mode: 0755
diff --git a/mutt/tasks/main.yml b/mutt/tasks/main.yml
index bb9ddc8..1763d6f 100644
--- a/mutt/tasks/main.yml
+++ b/mutt/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: mutt
     state: installed
 
 - name: install global configuration
-  template:
+  ansible.builtin.template:
     dest: /etc/Muttrc.local
     src: Muttrc.local
     mode: 0644
@@ -13,7 +13,7 @@
     group: "{{ ansible_wheel }}"
 
 - name: install mutt-folder helper script
-  copy:
+  ansible.builtin.copy:
     dest: /usr/local/bin/mutt-folder
     src: mutt-folder.sh
     mode: 0755
diff --git a/nvidia_driver/tasks/main.yml b/nvidia_driver/tasks/main.yml
index 692a1e1..882d233 100644
--- a/nvidia_driver/tasks/main.yml
+++ b/nvidia_driver/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: install drivers
-  package:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: installed
   with_items:
diff --git a/opencollab/tasks/main.yml b/opencollab/tasks/main.yml
index caa3a44..d045de0 100644
--- a/opencollab/tasks/main.yml
+++ b/opencollab/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: install dependencies
-  package:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: installed
   with_items:
@@ -9,14 +9,14 @@
     - python3
 
 - name: copy package
-  git:
+  ansible.builtin.git:
     dest: /usr/local/src/opencollab
     repo: "https://github.com/graphingwiki/opencollab.git"
     umask: "0022"
     version: python3
 
 - name: install package
-  pip:
+  ansible.builtin.pip:
     name: /usr/local/src/opencollab
     umask: "0022"
     executable: pip3
diff --git a/powertools_repo/tasks/main.yml b/powertools_repo/tasks/main.yml
index 4129b70..a06b33f 100644
--- a/powertools_repo/tasks/main.yml
+++ b/powertools_repo/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: check if repository is enabled
-  command:
+  ansible.builtin.command:
     argv:
       - dnf
       - config-manager
@@ -11,7 +11,7 @@
   register: result
 
 - name: enable repository
-  command:
+  ansible.builtin.command:
     argv:
       - dnf
       - config-manager
diff --git a/rpmfusion_free_repo/tasks/main.yml b/rpmfusion_free_repo/tasks/main.yml
index 9400c2a..c0b6c42 100644
--- a/rpmfusion_free_repo/tasks/main.yml
+++ b/rpmfusion_free_repo/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: install rpm signing key
-  rpm_key:
+  ansible.builtin.rpm_key:
     key: >
       {{
         rpmfusion_free_keyurl + "RPM-GPG-KEY-rpmfusion-free-el-" +
@@ -10,7 +10,7 @@
   when: 'ansible_distribution != "Fedora"'
 
 - name: install rpm signing key
-  rpm_key:
+  ansible.builtin.rpm_key:
     key: >
       {{
         rpmfusion_free_keyurl + "RPM-GPG-KEY-rpmfusion-free-fedora-2020"
@@ -19,7 +19,7 @@
   when: 'ansible_distribution == "Fedora"'
 
 - name: enable repository
-  package:
+  ansible.builtin.package:
     name: >
       {{
         rpmfusion_free_baseurl + "/el/rpmfusion-free-release-" +
@@ -29,7 +29,7 @@
   when: 'ansible_distribution != "Fedora"'
 
 - name: enable repository
-  package:
+  ansible.builtin.package:
     name: >
       {{
         rpmfusion_free_baseurl + "/fedora/rpmfusion-free-release-" +
diff --git a/rpmfusion_nonfree_repo/tasks/main.yml b/rpmfusion_nonfree_repo/tasks/main.yml
index 686a05f..a816b24 100644
--- a/rpmfusion_nonfree_repo/tasks/main.yml
+++ b/rpmfusion_nonfree_repo/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: install rpm signing key
-  rpm_key:
+  ansible.builtin.rpm_key:
     key: >
       {{
         rpmfusion_nonfree_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-el-" +
@@ -10,7 +10,7 @@
   when: 'ansible_distribution != "Fedora"'
 
 - name: install rpm signing key
-  rpm_key:
+  ansible.builtin.rpm_key:
     key: >
       {{
         rpmfusion_nonfree_keyurl + "RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020"
@@ -19,7 +19,7 @@
   when: 'ansible_distribution == "Fedora"'
 
 - name: enable repository
-  package:
+  ansible.builtin.package:
     name: >
       {{
         rpmfusion_nonfree_baseurl + "/el/rpmfusion-nonfree-release-" +
@@ -29,7 +29,7 @@
   when: 'ansible_distribution != "Fedora"'
 
 - name: enable repository
-  package:
+  ansible.builtin.package:
     name: >
       {{
         rpmfusion_nonfree_baseurl + "/fedora/rpmfusion-nonfree-release-" +
diff --git a/spotify/tasks/main.yml b/spotify/tasks/main.yml
index 91a07b6..b103373 100644
--- a/spotify/tasks/main.yml
+++ b/spotify/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: enable repository
-  yum_repository:
+  ansible.builtin.yum_repository:
     name: spotify
     baseurl: https://negativo17.org/repos/spotify/fedora-$releasever/x86_64/
     description: Spotify
@@ -10,6 +10,6 @@
     enabled: true
 
 - name: install spotify
-  package:
+  ansible.builtin.package:
     name: spotify
     state: present
diff --git a/thinlinc/tasks/main.yml b/thinlinc/tasks/main.yml
index 0c49b33..982928a 100644
--- a/thinlinc/tasks/main.yml
+++ b/thinlinc/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: install thinlinc repository
-  yum_repository:
+  ansible.builtin.yum_repository:
     name: thinlinc
     baseurl: "https://mirrors.foo.sh/thinlinc/{{ ansible_architecture }}"
     description: Cendio Thinlinc
@@ -8,18 +8,18 @@
     enabled: true
 
 - name: install thinlinc client
-  package:
+  ansible.builtin.package:
     name: thinlinc-client
     state: installed
 
 - name: set default server name
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /opt/thinlinc/etc/tlclient.conf
     regexp: '^SERVER_NAME='
     line: "SERVER_NAME=shell.foo.sh"
 
 - name: disable fullscreen mode
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /opt/thinlinc/etc/tlclient.conf
     regexp: '^{{ item }}='
     line: "{{ item }}=0"
@@ -28,13 +28,13 @@
     - FULL_SCREEN_ALL_MONITORS
 
 - name: set default screen size
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /opt/thinlinc/etc/tlclient.conf
     regexp: '^SCREEN_SIZE_SELECTION='
     line: "SCREEN_SIZE_SELECTION=2"
 
 - name: use kerberos authentication
-  lineinfile:
+  ansible.builtin.lineinfile:
     path: /opt/thinlinc/etc/tlclient.conf
     regexp: '^AUTHENTICATION_METHOD='
     line: "AUTHENTICATION_METHOD=kerberos"
diff --git a/thunderbird/tasks/main.yml b/thunderbird/tasks/main.yml
index ab62649..59125bf 100644
--- a/thunderbird/tasks/main.yml
+++ b/thunderbird/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 - name: install packages
-  package:
+  ansible.builtin.package:
     name: thunderbird
     state: installed
 
 - name: install default settings
-  copy:
+  ansible.builtin.copy:
     dest: /usr/lib64/thunderbird/defaults/pref/00-foo.sh.js
     src: foo.sh.js
     mode: 0644