diff --git a/defaults/main.yml b/defaults/main.yml
index 33adc4c..1bc0398 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,4 +2,4 @@
 subid_users: []
 ansible_become: true
 subuid_bitshift: 16
-subgid_bitshift: "{{subuid_bitshift}}"
+subgid_bitshift: "{{ subuid_bitshift }}"
diff --git a/meta/main.yml b/meta/main.yml
index df34196..ce16514 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -12,6 +12,6 @@ galaxy_info:
 
   min_ansible_version: "3.0"
 
-  galaxy_tags: ["subuid,subgid"]
+  galaxy_tags: ["subuid", "subgid"]
 
 dependencies: []
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 1da45a9..7f1218e 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -4,7 +4,7 @@
   diff: true
   tasks:
     - name: Set users for role
-      set_fact:
+      ansible.builtin.set_fact:
         subid_users:
           - james
           - thorsten
diff --git a/tasks/configure-user.yml b/tasks/configure-user.yml
index cdb8bc0..6a79155 100644
--- a/tasks/configure-user.yml
+++ b/tasks/configure-user.yml
@@ -2,7 +2,7 @@
 # https://eengstrom.github.io/musings/generate-non-contiguous-subuid-subgid-maps-for-rootless-podman
 
 - name: Get user infos
-  getent:
+  ansible.builtin.getent:
     database: passwd
     key: "{{ subid_user }}"
 
diff --git a/tasks/main.yml b/tasks/main.yml
index d50bc85..c7964c2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,5 @@
 - name: Configure each user
-  include_tasks: configure-user.yml
+  ansible.builtin.include_tasks: configure-user.yml
   loop: "{{ subid_users }}"
   loop_control:
     loop_var: "subid_user"