diff --git a/adhoc-ipagroup.yml b/adhoc-ipagroup.yml
index 3aa49e1..784fb66 100644
--- a/adhoc-ipagroup.yml
+++ b/adhoc-ipagroup.yml
@@ -37,13 +37,13 @@
         - groups
 
     - name: "Prepare FAS if required"
-      shell: "set -o pipefail && echo \"{{ ipaadmin_password  }}\" | kinit {{ ipa_admin }}"
+      ansible.builtin.shell: "set -o pipefail && echo \"{{ ipaadmin_password  }}\" | kinit {{ ipa_admin }}"
       check_mode: false
       changed_when: "1 != 1"
       when: ipa_fas
 
     - name: "Apply FAS"
-      command: "ipa group-mod --fasgroup {{ ipa_group }}"
+      ansible.builtin.command: "ipa group-mod --fasgroup {{ ipa_group }}"
       check_mode: false
       changed_when: "1 != 1"
       when: ipa_fas
diff --git a/role-rocky-ipa-client.yml b/role-rocky-ipa-client.yml
index 34d4761..5a05ae0 100644
--- a/role-rocky-ipa-client.yml
+++ b/role-rocky-ipa-client.yml
@@ -2,7 +2,7 @@
 # Configures an IPA client for the Rocky infrastructure
 # Define "host" as a hostgroup name or a single host
 - name: Configure IPA client
-  hosts: all
+  hosts: ipaclient
   become: true
   vars_files:
   - vars/ipa/ipaclient.yml
diff --git a/role-rocky-ipa-replica.yml b/role-rocky-ipa-replica.yml
index 6bc10bb..fef75c7 100644
--- a/role-rocky-ipa-replica.yml
+++ b/role-rocky-ipa-replica.yml
@@ -2,7 +2,7 @@
 # Creates an IPA replica
 # Define "host" as a hostgroup name or a single host
 - name: Configure IPA server
-  hosts: all
+  hosts: ipareplica
   become: true
 
   # This is to try to avoid the handler issue in pre/post tasks
diff --git a/role-rocky-ipa.yml b/role-rocky-ipa.yml
index 630c8e1..91002da 100644
--- a/role-rocky-ipa.yml
+++ b/role-rocky-ipa.yml
@@ -7,7 +7,7 @@
 # System fully up to date
 # Define "host" as a hostgroup name or a single host
 - name: Configure IPA server
-  hosts: all
+  hosts: ipaserver
   become: true
 
   # This is to try to avoid the handler issue in pre/post tasks