diff --git a/scripts/apache-config.yml b/scripts/apache-config.yml
index 426dc2878e2c8dbdd135a030471064fdf5660607..a167c68c3b38e501c310a243f5a191736397989d 100644
--- a/scripts/apache-config.yml
+++ b/scripts/apache-config.yml
@@ -4,6 +4,9 @@ cli:
     application:
       default: 'apache'
       help: 'The application to configure Apache for, e.g. apache, drupal, piwk, nextcloud, kibana'
+    site:
+      default: False
+      help: 'The id of a site (only useful with certain applications like Drupal or Piwik)'
 arguments:
   playbook: 'role'
   roles_exclude:
@@ -20,3 +23,7 @@ command:
     args:
       - 'limit'
       - 'application'
+  - name: 'extra-vars'
+    value: 'limit_site=%s'
+    args:
+      - 'site'
diff --git a/scripts/drupal-config.yml b/scripts/drupal-config.yml
index 8c052050f722fed87fc89ae3232c5c561ba8d56b..9620ff1ae2ebf36268bcd623c9af7f32f31f60c9 100644
--- a/scripts/drupal-config.yml
+++ b/scripts/drupal-config.yml
@@ -27,7 +27,7 @@ command:
       - 'limit'
   - name: 'extra-vars'
     condition: 'site'
-    value: 'limit_drupal_site=%s'
+    value: 'limit_site=%s'
     args:
       - 'site'
   - name: 'start-at-task'
diff --git a/scripts/drupal-deploy.yml b/scripts/drupal-deploy.yml
index fd704ee32128610d268b41afa16890ce5bf13406..a829e4e8ae41b7db84b0b04a7f94dc40886c2789 100644
--- a/scripts/drupal-deploy.yml
+++ b/scripts/drupal-deploy.yml
@@ -24,7 +24,7 @@ command:
     args:
       - 'host'
   - name: 'extra-vars'
-    value: 'limit_drupal_site=%s'
+    value: 'limit_site=%s'
     args:
       - 'site'
   - name: 'start-at-task'
diff --git a/scripts/drush-aliases.yml b/scripts/drush-aliases.yml
index 4546562d1caa8ebc9ffe00915b421b3d163ad7cf..35119053c73166809e2360da63a1bf49b7cc9594 100644
--- a/scripts/drush-aliases.yml
+++ b/scripts/drush-aliases.yml
@@ -22,6 +22,6 @@ command:
       - 'limit'
   - name: 'extra-vars'
     condition: 'site'
-    value: 'limit_drupal_site=%s'
+    value: 'limit_site=%s'
     args:
       - 'site'
diff --git a/scripts/jailkit-update.yml b/scripts/jailkit-update.yml
index f3707f9da62f1df4c160f901f43ad4c81bc96478..afe624298e0435c85d704e150d8847f9e25d336a 100644
--- a/scripts/jailkit-update.yml
+++ b/scripts/jailkit-update.yml
@@ -17,6 +17,6 @@ command:
     value: 'JailKit Role'
   - name: 'extra-vars'
     condition: 'site'
-    value: 'limit_drupal_site=%s'
+    value: 'limit_site=%s'
     args:
       - 'site'
diff --git a/scripts/jailkit-user.yml b/scripts/jailkit-user.yml
index 13f64a4c02812541eb3618c9f6cfe1c8ad0f4b8b..f7e5d02ee35ce45616e6caf8bfbe30bf3729b453 100644
--- a/scripts/jailkit-user.yml
+++ b/scripts/jailkit-user.yml
@@ -15,6 +15,6 @@ command:
       - 'SetPermissions'
   - name: 'extra-vars'
     condition: 'site'
-    value: 'limit_drupal_site=%s'
+    value: 'limit_site=%s'
     args:
       - 'site'