diff --git a/adhoc-ipabinder.yml b/adhoc-ipabinder.yml
index fd59da3..46472e9 100644
--- a/adhoc-ipabinder.yml
+++ b/adhoc-ipabinder.yml
@@ -6,7 +6,7 @@
 #  -> ipa_binder_password: Bind account password
 
 - name: Create binder account
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: true
 
   tasks:
diff --git a/adhoc-ipadnsrecord.yml b/adhoc-ipadnsrecord.yml
index 6fcdd3b..2a26c51 100644
--- a/adhoc-ipadnsrecord.yml
+++ b/adhoc-ipadnsrecord.yml
@@ -12,7 +12,7 @@
 #  -> ipa_presence: present or absent
 
 - name: Create a DNS Record
-  hosts: all
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipadnszone.yml b/adhoc-ipadnszone.yml
index 3587a1f..69fff74 100644
--- a/adhoc-ipadnszone.yml
+++ b/adhoc-ipadnszone.yml
@@ -4,7 +4,7 @@
 #       provided.
 
 - name: Create a DNS Zone
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipagroup.yml b/adhoc-ipagroup.yml
index b547e48..46d284d 100644
--- a/adhoc-ipagroup.yml
+++ b/adhoc-ipagroup.yml
@@ -6,11 +6,11 @@
 # set to true.
 
 - name: Create a group
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
   vars_files:
-  - vars/vaults/userman.yml
+    - vars/vaults/userman.yml
 
   tasks:
     - name: "Checking for user variables"
diff --git a/adhoc-ipaservice.yml b/adhoc-ipaservice.yml
index 7c78b41..18f4dbd 100644
--- a/adhoc-ipaservice.yml
+++ b/adhoc-ipaservice.yml
@@ -3,7 +3,7 @@
 # What: Creates kerberos services in the idm infrastructure based on the variables provided
 
 - name: Create Services
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipauser-disable-pdr.yml b/adhoc-ipauser-disable-pdr.yml
index bec94f1..f927850 100644
--- a/adhoc-ipauser-disable-pdr.yml
+++ b/adhoc-ipauser-disable-pdr.yml
@@ -7,7 +7,7 @@
 #       for the RESF to query.
 
 - name: Disable a User - PDR
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipauser-disable.yml b/adhoc-ipauser-disable.yml
index 78143c3..05d207b 100644
--- a/adhoc-ipauser-disable.yml
+++ b/adhoc-ipauser-disable.yml
@@ -3,7 +3,7 @@
 # What: Creates users in the idm infrastructure based on the variables provided.
 
 - name: Create a User
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipauser-enable.yml b/adhoc-ipauser-enable.yml
index dbd4c24..2c2205a 100644
--- a/adhoc-ipauser-enable.yml
+++ b/adhoc-ipauser-enable.yml
@@ -3,7 +3,7 @@
 # What: Creates users in the idm infrastructure based on the variables provided.
 
 - name: Create a User
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false
 
diff --git a/adhoc-ipauser.yml b/adhoc-ipauser.yml
index 8da45b5..38e55a2 100644
--- a/adhoc-ipauser.yml
+++ b/adhoc-ipauser.yml
@@ -3,7 +3,7 @@
 # What: Creates users in the idm infrastructure based on the variables provided.
 
 - name: Create a User
-  hosts: "{{ ipaserver|default('all') }}"
+  hosts: "{{ host|default('ipaserver') }}"
   become: false
   gather_facts: false