diff --git a/README.md b/README.md
index 3bfb52f..9e3bcf7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # git-role
 
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/git-role/status.svg)](https://drone.cryptic.systems/volker.raschek/git-role)
-[![Ansible Role](https://img.shields.io/ansible/role/d/58170)](https://galaxy.ansible.com/volker_raschek/git_role)
+[![Ansible Role](https://img.shields.io/ansible/role/d/58759)](https://galaxy.ansible.com/volker_raschek/git)
 
 With following role can be git for users configured.
 
diff --git a/tasks/git_user.yml b/tasks/git_user.yml
index 0145a35..0b659b5 100644
--- a/tasks/git_user.yml
+++ b/tasks/git_user.yml
@@ -6,7 +6,7 @@
     key: "{{ item.key }}"
 
 - name: Create git config directory for {{ item.key }}
-  file:
+  ansible.builtin.file:
     dest: "{{ getent_passwd[item.key][4] }}/.config/git"
     owner: "{{ item.key }}"
     group: "{{ getent_passwd[item.key][2] }}"
@@ -14,7 +14,7 @@
     mode: 0755
 
 - name: Create global git config files
-  template:
+  ansible.builtin.template:
     src: "{{ filename }}.j2"
     dest: "{{ getent_passwd[item.key][4] }}/{{ filename }}"
     owner: "{{ item.key }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 5047bbf..f506758 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 
-- name: Include special distribution-dependent variables
+- name: Include OS-specific variables
   include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Install git and dependencies
-  package:
+  ansible.builtin.package:
     name: "{{ item }}"
     state: present
   with_items: "{{ git_package_names }}"
@@ -12,4 +12,4 @@
 - name: Configure git
   include_tasks: git_user.yml
   with_dict:
-  - "{{ git_users }}"
\ No newline at end of file
+  - "{{ git_users }}"