diff --git a/roles/mariadb/handlers/main.yml b/roles/mariadb/handlers/main.yml
index 0a8429a..45c279a 100644
--- a/roles/mariadb/handlers/main.yml
+++ b/roles/mariadb/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-- name: restart mariadb
-  service:
+- name: Restart mariadb
+  ansible.builtin.service:
     name: mariadb
     state: restarted
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 0008a61..519068d 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
-- name: install packages
-  package:
+- name: Install packages
+  ansible.builtin.package:
     name: "{{ item }}"
     state: installed
   with_items:
     - mariadb-server
     - python3-PyMySQL
 
-- name: fix selinux contexts from data directory
-  sefcontext:
+- name: Fix SELinux contexts from data directory
+  community.general.sefcontext:
     path: "/export/mariadb(/.*)?"
     setype: mysqld_db_t
 
-- name: create data directory
-  file:
+- name: Create data directory
+  ansible.builtin.file:
     path: /export/mariadb
     state: directory
     mode: 0750
@@ -21,8 +21,8 @@
     group: mysql
     setype: _default
 
-- name: link data diretory
-  file:
+- name: Link data diretory
+  ansible.builtin.file:
     dest: /srv/mariadb
     src: /export/mariadb
     state: link
@@ -30,54 +30,54 @@
     group: "{{ ansible_wheel }}"
     follow: false
 
-- name: configure data directory
-  lineinfile:
+- name: Configure data directory
+  ansible.builtin.lineinfile:
     path: /etc/my.cnf.d/mariadb-server.cnf
     regexp: "^datadir=.*"
     line: datadir=/srv/mariadb
-  notify: restart mariadb
+  notify: Restart mariadb
 
-- name: create additional config directory
-  file:
+- name: Create additional config directory
+  ansible.builtin.file:
     path: /etc/mysql
     state: directory
     mode: 0750
     owner: root
     group: mysql
 
-- name: allow mysql user to read private key
-  user:
+- name: Allow mysql user to read private key
+  ansible.builtin.user:
     name: mysql
     groups: hostkey
     append: true
-  notify: restart mariadb
+  notify: Restart mariadb
 
-- name: create tls configuration
-  template:
+- name: Create TLS configuration
+  ansible.builtin.template:
     dest: /etc/my.cnf.d/tls.cnf
     src: tls.cnf.j2
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
-  notify: restart mariadb
+  notify: Restart mariadb
 
-- name: create local configuration
-  copy:
+- name: Create local configuration
+  ansible.builtin.copy:
     dest: /etc/my.cnf.d/local.cnf
     content: "[mariadb]\ninnodb_file_per_table=ON\n"
     mode: 0644
     owner: root
     group: "{{ ansible_wheel }}"
-  notify: restart mariadb
+  notify: Restart mariadb
 
-- name: enable service
-  service:
+- name: Enable service
+  ansible.builtin.service:
     name: mariadb
     state: started
     enabled: true
 
-- name: set root password
-  mysql_user:
+- name: Set root password
+  community.mysql.mysql_user:
     name: root
     password: "{{ mariadb_root_password }}"
     login_user: root
@@ -87,8 +87,8 @@
   no_log: true
   when: mariadb_root_password is defined
 
-- name: create root .my.cnf
-  template:
+- name: Create root .my.cnf
+  ansible.builtin.template:
     dest: /root/.my.cnf
     src: my.cnf.j2
     mode: 0600
@@ -96,24 +96,24 @@
     group: "{{ ansible_wheel }}"
   when: mariadb_root_password is defined
 
-- name: import sftpuser role
-  import_role:
+- name: Import sftpuser role
+  ansible.builtin.import_role:
     name: sftpuser
   vars:
     chroot: /srv/backup
     user: backup
     publickeys: "{{ backup_publickeys }}"
 
-- name: create backup directory
-  file:
+- name: Create backup directory
+  ansible.builtin.file:
     path: /export/backup
     state: directory
     mode: 02750
     owner: root
     group: backup
 
-- name: link backup directory
-  file:
+- name: Link backup directory
+  ansible.builtin.file:
     path: /srv/backup
     src: /export/backup
     state: link
@@ -121,16 +121,16 @@
     group: "{{ ansible_wheel }}"
     follow: false
 
-- name: copy backup script
-  copy:
+- name: Copy backup script
+  ansible.builtin.copy:
     dest: /usr/local/sbin/mariadb-backup
     src: mariadb-backup.sh
     mode: 0755
     owner: root
     group: "{{ ansible_wheel }}"
 
-- name: create backup cron job
-  cron:
+- name: Create backup cron job
+  ansible.builtin.cron:
     name: mariadb-backup
     job: /usr/local/sbin/mariadb-backup
     hour: "0"