diff --git a/defaults/main.yml b/defaults/main.yml
index b9f17b0..f21cd19 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -106,10 +106,9 @@ cvmfs_config_repo: {}
 # CVMFS_CONFIG_REPOSITORY is not supported on Debian < 9, Ubuntu LTS < 18.04
 cvmfs_config_repo_supported: >-
   {{
-    'true' if ansible_os_family != 'Debian' else (
-    'true' if (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) else (
-    'true' if (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) else
-    'false'))
+    ansible_os_family != 'Debian' or
+    (ansible_distribution == 'Debian' and ansible_distribution_version is version('9', '>=')) or
+    (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('18.04', '>=')) 
   }}
 
 # When to update the GeoIP database, if cvmfs_geo_license_key is defined
diff --git a/tasks/client.yml b/tasks/client.yml
index c12a601..3b2c290 100644
--- a/tasks/client.yml
+++ b/tasks/client.yml
@@ -27,7 +27,7 @@
   when: not ansible_check_mode and "CernVM-FS map is not referenced" in cvmfs_config_chksetup_out.stdout
 
 - name: Configure CernVM-FS config repository
-  when: cvmfs_config_repo and cvmfs_config_repo_supported
+  when: (cvmfs_config_repo | length > 0) and (cvmfs_config_repo_supported | bool)
   block:
     - name: Create config repo config
       ansible.builtin.copy: