diff --git a/playbooks/role.yml b/playbooks/role.yml
index a813354ac36d35786ea48c95f05beda4bb155628..dbc9d10ad5c40487599995140c86b66eb4b3e374 100644
--- a/playbooks/role.yml
+++ b/playbooks/role.yml
@@ -8,7 +8,7 @@
 - include: "validate.yml"
 
 - name: "Execute Role {{ role }}"
-  hosts: "{{ hosts|default('all') }}:!norootserver"
+  hosts: "{{ hostslimit|default('all') }}:!norootserver"
   become: yes
   roles:
     - "{{ role }}"
diff --git a/scripts/apache-config.yml b/scripts/apache-config.yml
index 5530c283c9531815472730983eed5b1dc3f40dcc..426dc2878e2c8dbdd135a030471064fdf5660607 100644
--- a/scripts/apache-config.yml
+++ b/scripts/apache-config.yml
@@ -16,7 +16,7 @@ command:
   - name: 'tags'
     value: 'ApacheConfig'
   - name: 'extra-vars'
-    value: 'hosts=%s role=%s'
+    value: 'hostslimit=%s role=%s'
     args:
       - 'limit'
       - 'application'
diff --git a/scripts/composer-update.yml b/scripts/composer-update.yml
index 91514ab2e3e423fd54d73a4931112d74ce670a53..c89e7dfb7f7c7b200382746fbead3f4beab73e46 100644
--- a/scripts/composer-update.yml
+++ b/scripts/composer-update.yml
@@ -6,7 +6,7 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=composer'
+    value: 'hostslimit=%s role=composer'
     args:
       - 'limit'
   - name: 'tags'
diff --git a/scripts/connectivity.yml b/scripts/connectivity.yml
index 30284ec064e82824236fef49e71c1df0a33c3611..ed8d8c1ad469cf3b8dd2482b985fc3e6baf36738 100644
--- a/scripts/connectivity.yml
+++ b/scripts/connectivity.yml
@@ -7,6 +7,6 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=commonconnect'
+    value: 'hostslimit=%s role=commonconnect'
     args:
       - 'limit'
diff --git a/scripts/drupal-config.yml b/scripts/drupal-config.yml
index ef8d8673fa748610a5fc38d1b6489fff3474a08b..8c052050f722fed87fc89ae3232c5c561ba8d56b 100644
--- a/scripts/drupal-config.yml
+++ b/scripts/drupal-config.yml
@@ -22,7 +22,7 @@ arguments:
     - 'apache'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=drupal'
+    value: 'hostslimit=%s role=drupal'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/drupal-deploy.yml b/scripts/drupal-deploy.yml
index 4c1e103a3da027bb9d8b13edcd29db28f6707a52..fd704ee32128610d268b41afa16890ce5bf13406 100644
--- a/scripts/drupal-deploy.yml
+++ b/scripts/drupal-deploy.yml
@@ -20,7 +20,7 @@ command:
   - name: 'tags'
     value: 'deploy'
   - name: 'extra-vars'
-    value: 'hosts=%s role=drupal'
+    value: 'hostslimit=%s role=drupal'
     args:
       - 'host'
   - name: 'extra-vars'
diff --git a/scripts/drush-aliases.yml b/scripts/drush-aliases.yml
index fe2dd320cb0d2b0ccdc36342d917371ec9edcd1c..4546562d1caa8ebc9ffe00915b421b3d163ad7cf 100644
--- a/scripts/drush-aliases.yml
+++ b/scripts/drush-aliases.yml
@@ -17,7 +17,7 @@ command:
     condition: 'fetch'
     value: 'DrushUpdateAliases'
   - name: 'extra-vars'
-    value: 'hosts=%s role=drush'
+    value: 'hostslimit=%s role=drush'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/elastalert-rules.yml b/scripts/elastalert-rules.yml
index dee89b43e2f012a6304331485a2b8135da1b73a7..ddeff1e7ba5a57d337a4643401625eaa681aa70a 100644
--- a/scripts/elastalert-rules.yml
+++ b/scripts/elastalert-rules.yml
@@ -10,6 +10,6 @@ command:
   - name: 'tags'
     value: 'Rules'
   - name: 'extra-vars'
-    value: 'hosts=%s role=elastalert'
+    value: 'hostslimit=%s role=elastalert'
     args:
       - 'limit'
diff --git a/scripts/elastalert.yml b/scripts/elastalert.yml
index 39db9d679b172c5596a95e74f75fafe4bc73947b..3f88c5b375486047f3b3b0151dd006075a2271d2 100644
--- a/scripts/elastalert.yml
+++ b/scripts/elastalert.yml
@@ -8,6 +8,6 @@ arguments:
     - 'elasticsearch'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=elastalert'
+    value: 'hostslimit=%s role=elastalert'
     args:
       - 'limit'
diff --git a/scripts/fail2ban.yml b/scripts/fail2ban.yml
index 1e2523bb684b5ed654cf1898b8f7a38561d19534..7489501933ae5fce171e261ea642312d27225f80 100644
--- a/scripts/fail2ban.yml
+++ b/scripts/fail2ban.yml
@@ -3,6 +3,6 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=fail2ban'
+    value: 'hostslimit=%s role=fail2ban'
     args:
       - 'limit'
diff --git a/scripts/firewall-config.yml b/scripts/firewall-config.yml
index bf561eae213a4b840928bcad39f9ddf220fb0632..8f6e1c4016c0d8c1897e8ad3fb52514efbc10083 100644
--- a/scripts/firewall-config.yml
+++ b/scripts/firewall-config.yml
@@ -8,6 +8,6 @@ command:
   - name: 'tags'
     value: 'firewall'
   - name: 'extra-vars'
-    value: 'hosts=%s role=common'
+    value: 'hostslimit=%s role=common'
     args:
       - 'limit'
diff --git a/scripts/fluentd-client.yml b/scripts/fluentd-client.yml
index 3191fd45e200879896dc7c6d9c153e06ba03be70..3d42c785f22ffb39624ea4731511b7c99d8bf53c 100644
--- a/scripts/fluentd-client.yml
+++ b/scripts/fluentd-client.yml
@@ -3,6 +3,6 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=fluentd-client'
+    value: 'hostslimit=%s role=fluentd-client'
     args:
       - 'limit'
diff --git a/scripts/fluentd.yml b/scripts/fluentd.yml
index 29dab2a90d4d44daa292411cb972a0d4e3b4c8fb..9691e1f0642ef228fd3e37a683dfd80e61aa2383 100644
--- a/scripts/fluentd.yml
+++ b/scripts/fluentd.yml
@@ -3,6 +3,6 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=fluentd'
+    value: 'hostslimit=%s role=fluentd'
     args:
       - 'limit'
diff --git a/scripts/haproxy-certs.yml b/scripts/haproxy-certs.yml
index 42e8a59193e23a331f8a0724eef42f04490f16d2..00ad230a65b9b7a4a1c3d980415647cf6a1f3e48 100644
--- a/scripts/haproxy-certs.yml
+++ b/scripts/haproxy-certs.yml
@@ -12,6 +12,6 @@ command:
   - name: 'tags'
     value: 'Certs'
   - name: 'extra-vars'
-    value: 'hosts=%s role=haproxy'
+    value: 'hostslimit=%s role=haproxy'
     args:
       - 'limit'
diff --git a/scripts/haproxy-config.yml b/scripts/haproxy-config.yml
index ca5ecb676e38dd811e87edcd513b618debd94f80..4764dbb58e64df0aa090094f02572de4398df140 100644
--- a/scripts/haproxy-config.yml
+++ b/scripts/haproxy-config.yml
@@ -12,6 +12,6 @@ command:
   - name: 'tags'
     value: 'Config'
   - name: 'extra-vars'
-    value: 'hosts=%s role=haproxy'
+    value: 'hostslimit=%s role=haproxy'
     args:
       - 'limit'
diff --git a/scripts/jailkit-update.yml b/scripts/jailkit-update.yml
index 06ddc1a6a4ae564047a041f98186c73c98eb11f1..f3707f9da62f1df4c160f901f43ad4c81bc96478 100644
--- a/scripts/jailkit-update.yml
+++ b/scripts/jailkit-update.yml
@@ -10,7 +10,7 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=jailkit jailsite_init_force=True'
+    value: 'hostslimit=%s role=jailkit jailsite_init_force=True'
     args:
       - 'limit'
   - name: 'start-at-task'
diff --git a/scripts/jailkit-upgrade.yml b/scripts/jailkit-upgrade.yml
index 3956aa5c39c25533a8c8cb19dac4bb072130fbf6..8dda5b164e22b3b2b5859d5009c132310ed2a26d 100644
--- a/scripts/jailkit-upgrade.yml
+++ b/scripts/jailkit-upgrade.yml
@@ -6,7 +6,7 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=jailkit'
+    value: 'hostslimit=%s role=jailkit'
     args:
       - 'limit'
   - name: 'start-at-task'
diff --git a/scripts/localhost.yml b/scripts/localhost.yml
index 2760ab94e6786f5823b4c966cae40473dbc10589..b4fab22f744e2f06a0a666417ad5fc920de18a32 100644
--- a/scripts/localhost.yml
+++ b/scripts/localhost.yml
@@ -18,7 +18,7 @@ arguments:
   company: 'local'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=commonconnect admins=%s'
+    value: 'hostslimit=%s role=commonconnect admins=%s'
     args:
       - 'host'
       - 'user'
diff --git a/scripts/netdata.yml b/scripts/netdata.yml
index ef4d1318508dcb48adaf3b8ac48d177a5640eddc..5749228082e0d05b8829351be253bcece6ffb001 100644
--- a/scripts/netdata.yml
+++ b/scripts/netdata.yml
@@ -11,7 +11,7 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=netdata'
+    value: 'hostslimit=%s role=netdata'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/network.yml b/scripts/network.yml
index 654ca611a645793b57293474eafa74583157504a..015147c3e6f68aa9ef5f8af645bf7b535145da66 100644
--- a/scripts/network.yml
+++ b/scripts/network.yml
@@ -8,6 +8,6 @@ command:
   - name: 'tags'
     value: 'network'
   - name: 'extra-vars'
-    value: 'hosts=%s role=common'
+    value: 'hostslimit=%s role=common'
     args:
       - 'limit'
diff --git a/scripts/nextcloud-plugins.yml b/scripts/nextcloud-plugins.yml
index 0fc0b13a712312ecbb5d7358f758d6b2c071db80..054506bcc7bfb35c6c9c495ff17debee75f3659c 100644
--- a/scripts/nextcloud-plugins.yml
+++ b/scripts/nextcloud-plugins.yml
@@ -20,7 +20,7 @@ command:
   - name: 'tags'
     value: 'plugins'
   - name: 'extra-vars'
-    value: 'hosts=%s role=nextcloud'
+    value: 'hostslimit=%s role=nextcloud'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/nextcloud.yml b/scripts/nextcloud.yml
index a85c88178841f7036657f5c95933b4904b821128..80fac86e69bd75c9590c48bfc8d083ad3a8ce7cc 100644
--- a/scripts/nextcloud.yml
+++ b/scripts/nextcloud.yml
@@ -20,7 +20,7 @@ command:
   - name: 'tags'
     value: 'deploy'
   - name: 'extra-vars'
-    value: 'hosts=%s role=nextcloud'
+    value: 'hostslimit=%s role=nextcloud'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/piwik.yml b/scripts/piwik.yml
index 4a46ede70f089f24f1b5047b84135f564d9846fa..8bb785e05b76521e62dc3b3de67af5be758b5b84 100644
--- a/scripts/piwik.yml
+++ b/scripts/piwik.yml
@@ -21,7 +21,7 @@ command:
   - name: 'tags'
     value: 'deploy'
   - name: 'extra-vars'
-    value: 'hosts=%s role=piwik'
+    value: 'hostslimit=%s role=piwik'
     args:
       - 'limit'
   - name: 'extra-vars'
diff --git a/scripts/removehost.yml b/scripts/removehost.yml
index 4496c0eb178750e4c8dbc72a20575c14d3bb6399..583c1576c5fb960a96e1b50d54446d3c7a0b1167 100644
--- a/scripts/removehost.yml
+++ b/scripts/removehost.yml
@@ -14,7 +14,7 @@ arguments:
   playbook: 'removehost'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s'
+    value: 'hostslimit=%s'
     args:
       - 'host'
   - name: 'extra-vars'
diff --git a/scripts/role.yml b/scripts/role.yml
index ba955281b0b8978e6e03b0f1363759a9dcefa854..2a65717d194da5504a742299bf248b8f7d47704a 100644
--- a/scripts/role.yml
+++ b/scripts/role.yml
@@ -3,13 +3,11 @@ cli:
   arguments:
     role:
       help: 'Role to execute'
-    hosts:
-      help: 'Host name or pattern'
 arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=%s'
+    value: 'hostslimit=%s role=%s'
     args:
-      - 'hosts'
+      - 'limit'
       - 'role'
diff --git a/scripts/uptime.yml b/scripts/uptime.yml
index 528f76bad7f0ae3bf4f070ba66bafc856b5bf797..bb4d3058f9b8154937866fb9d4640c84786ad8b0 100644
--- a/scripts/uptime.yml
+++ b/scripts/uptime.yml
@@ -8,6 +8,6 @@ command:
   - name: 'start-at-task'
     value: 'Uptime Role'
   - name: 'extra-vars'
-    value: 'hosts=%s role=uptime'
+    value: 'hostslimit=%s role=uptime'
     args:
       - 'limit'
diff --git a/scripts/userfiles.yml b/scripts/userfiles.yml
index d50010e2addc534e9c84d241457df856a72c9622..c1fedafb80222e2a96689c9d6aea873b482fa7e5 100644
--- a/scripts/userfiles.yml
+++ b/scripts/userfiles.yml
@@ -8,6 +8,6 @@ command:
   - name: 'tags'
     value: 'userfiles'
   - name: 'extra-vars'
-    value: 'hosts=%s role=common'
+    value: 'hostslimit=%s role=common'
     args:
       - 'limit'
diff --git a/scripts/users.yml b/scripts/users.yml
index 09970e02effbccfed669ba7b82d3e623cbc3f1de..99b12c23dfc13d66c8b334b65d3cf92dff3d83b7 100644
--- a/scripts/users.yml
+++ b/scripts/users.yml
@@ -7,7 +7,7 @@ arguments:
   playbook: 'role'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=commonauth'
+    value: 'hostslimit=%s role=commonauth'
     args:
       - 'limit'
 follower:
diff --git a/scripts/varnish-config.yml b/scripts/varnish-config.yml
index a2160f43ecb45c44045d34d3065b5309b6178137..1e6f7fdba1ddbb2b711a7bb80caea40fe2dad2e1 100644
--- a/scripts/varnish-config.yml
+++ b/scripts/varnish-config.yml
@@ -8,6 +8,6 @@ command:
   - name: 'tags'
     value: 'Config'
   - name: 'extra-vars'
-    value: 'hosts=%s role=varnish'
+    value: 'hostslimit=%s role=varnish'
     args:
       - 'limit'
diff --git a/scripts/youtrack.yml b/scripts/youtrack.yml
index 9d3381193eeecd6b59f384e00cf594d070ad56ae..e1e09590cb0bec39fa1fda1eb53ea10a62a93105 100644
--- a/scripts/youtrack.yml
+++ b/scripts/youtrack.yml
@@ -13,6 +13,6 @@ arguments:
     - 'php'
 command:
   - name: 'extra-vars'
-    value: 'hosts=%s role=outrack'
+    value: 'hostslimit=%s role=outrack'
     args:
       - 'limit'