diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 16b48a336f..24ef70aebc 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -63,12 +63,13 @@
 
   tasks:
   - name: Setup pagure user
+    tags: pagure-user
     user:
       name: pagure
       uid: "{{ pagure_static_uid }}"
       shell: /sbin/nologin
       comment: "Pagure User"
-    when: env == "staging" and inventory_hostname.startswith('pkgs01')
+    when: env == "staging"
       ## The above should be deleted when we rebuild pkgs02 in future.