diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 3a81a3dced..681eeac974 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -49,7 +49,7 @@
     user:
       name: pagure
       uid: "{{ pagure_static_uid }}"
-      ansible.builtin.shell: /sbin/nologin
+      shell: /sbin/nologin
       comment: "Pagure User"
     when: env == "staging"
     ## The above should be deleted when we rebuild pkgs02 in future.
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index c2b389be8c..fc7f4a56ee 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -19,7 +19,7 @@
     name: bodhi
     group: bodhi
     comment: Bodhi Server
-    ansible.builtin.shell: /sbin/nologin
+    shell: /sbin/nologin
     home: /usr/share/bodhi
     system: yes
     state: present
diff --git a/roles/mirror_pagure_ansible/tasks/main.yml b/roles/mirror_pagure_ansible/tasks/main.yml
index 9541ca4295..d8ecfea0e2 100644
--- a/roles/mirror_pagure_ansible/tasks/main.yml
+++ b/roles/mirror_pagure_ansible/tasks/main.yml
@@ -14,7 +14,7 @@
 - name: Setup pagure user
   user:
     name: mirror_pagure_ansible
-    ansible.builtin.shell: /sbin/nologin
+    shell: /sbin/nologin
     comment: "mirror_pagure_ansible User"
   tags:
   - mirror_pagure_ansible
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 36f9314d0c..5e314c9e40 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -97,7 +97,7 @@
     home: "/var/lib/openqa"
     createhome: no
     system: yes
-    ansible.builtin.shell: /sbin/nologin
+    shell: /sbin/nologin
   when: "openqa_static_uid is defined"
 
 - name: Remove old scratch repo directory
diff --git a/roles/robosignatory/tasks/main.yml b/roles/robosignatory/tasks/main.yml
index 23e141a41e..e063f1dd6a 100644
--- a/roles/robosignatory/tasks/main.yml
+++ b/roles/robosignatory/tasks/main.yml
@@ -29,7 +29,7 @@
     system: yes
     home: /etc/robosignatory
     comment: Robosignatory
-    ansible.builtin.shell: /sbin/nologin
+    shell: /sbin/nologin
     uid: 263
   tags:
   - config
diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml
index 7f1ba74798..5e2c27673e 100644
--- a/roles/web-data-analysis/tasks/main.yml
+++ b/roles/web-data-analysis/tasks/main.yml
@@ -108,7 +108,7 @@
   user:
     name: countme
     group: countme
-    ansible.builtin.shell: /sbin/nologin
+    shell: /sbin/nologin
     home: /srv/countme
     comment: "DNF countme counter"
   tags: