diff --git a/tasks/initjailusers.yml b/tasks/initjailusers.yml
index 355246b9ddb51a24cb73b2567b2176bfe3081c46..020377acded2f98716ab47de059b67e3110642a0 100644
--- a/tasks/initjailusers.yml
+++ b/tasks/initjailusers.yml
@@ -21,7 +21,7 @@
        '.ssh',
        '.zshrc'
       ]
-  when: item.0.jail is defined and username in item.0.jail.users and (limit_site is not defined or limit_site == 'False' or item.0.id is not defined or limit_site == item.0.id)
+  when: item.0.jail is defined and username in item.0.jail.users and (limit_site is not defined or limit_site == 'no' or item.0.id is not defined or limit_site == item.0.id)
   ignore_errors: yes
   tags:
     - JailUserInit
@@ -32,7 +32,7 @@
     groups: '{{ item.jail.name }}'
     append: yes
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
   tags:
     - SetPermissions
 
@@ -43,7 +43,7 @@
     regexp: '^{{ username }}:'
     line: '{{ username }}:x:{{ userid.stdout }}:0::/var/www{{ item.webRoot|default("") }}:/bin/bash'
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and username in item.jail.users and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and username in item.jail.users and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
   tags:
     - SetPermissions
 
@@ -55,7 +55,7 @@
     recurse: yes
     follow: no
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (username in item.jail.users or username in admins) and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
   tags:
     - JailUserInit
     - SetPermissions
diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml
index 59a40268380e4c27eac493e53835ef6138b2effa..9c2ecbb18a9f6f6bee4752bdc7594860a21a64fd 100644
--- a/tasks/jailkit.yml
+++ b/tasks/jailkit.yml
@@ -67,14 +67,14 @@
     mode: 0755
   register: jail_available
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
 
 - name: Init Jails
   include_tasks: initjail.yml
   with_items: '{{ drupal_settings|default([]) }}'
   loop_control:
     loop_var: drupal
-  when: drupal.jail is defined and (jail_available is changed or jailsite_init_force) and (limit_site is not defined or limit_site == 'False' or drupal.id is not defined or limit_site == drupal.id)
+  when: drupal.jail is defined and (jail_available is changed or jailsite_init_force) and (limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id)
 
 - name: Ensure tmp Directory
   file:
@@ -84,7 +84,7 @@
     group: root
     mode: 0777
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
 
 - name: Ensure var and log Directory
   file:
@@ -94,7 +94,7 @@
     group: root
     mode: 0755
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
 
 - name: Ensure Apache Log Directory
   file:
@@ -104,7 +104,7 @@
     group: '{{ item.jail.name }}'
     mode: 0755
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
 
 - name: Install logrotate script
   template:
@@ -114,7 +114,7 @@
     group: root
     mode: 0644
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
   tags:
     - logrotate
 
@@ -126,7 +126,7 @@
     group: '{{ item.jail.name }}'
     mode: 0755
   with_items: '{{ drupal_settings|default([]) }}'
-  when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+  when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
 
 - block:
 
@@ -143,7 +143,7 @@
       group: root
       mode: 0644
     with_items: '{{ drupal_settings|default([]) }}'
-    when: item.jail is defined and (limit_site is not defined or limit_site == 'False' or item.id is not defined or limit_site == item.id)
+    when: item.jail is defined and (limit_site is not defined or limit_site == 'no' or item.id is not defined or limit_site == item.id)
     tags:
       - ApacheConfig
     notify:
@@ -199,7 +199,7 @@
   with_items: '{{ drupal_settings|default([]) }}'
   loop_control:
     loop_var: drupal
-  when: drupal.jail is defined and (limit_site is not defined or limit_site == 'False' or drupal.id is not defined or limit_site == drupal.id)
+  when: drupal.jail is defined and (limit_site is not defined or limit_site == 'no' or drupal.id is not defined or limit_site == drupal.id)
   tags:
     - UpdateJails
     - shells