diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml
index 02c4d3e2..ca3dafed 100644
--- a/roles/composer/tasks/main.yml
+++ b/roles/composer/tasks/main.yml
@@ -30,7 +30,7 @@
       loop_control:
         loop_var: template
       when:
-        - composer.templates | length
+        - composer.templates | length > 0
 
     - name: Create additional symlinks.
       ansible.builtin.file:
@@ -42,4 +42,4 @@
       loop_control:
         loop_var: link
       when:
-        - composer.symlinks | length
+        - composer.symlinks | length > 0
diff --git a/roles/config_generate/tasks/main.yml b/roles/config_generate/tasks/main.yml
index dacf9615..4d17e588 100644
--- a/roles/config_generate/tasks/main.yml
+++ b/roles/config_generate/tasks/main.yml
@@ -12,7 +12,7 @@
   loop_control:
     loop_var: template
   when:
-    - config_generate.templates | length
+    - config_generate.templates | length > 0
     - deploy_operation == "deploy"
 
 - name: Create additional symlinks.
@@ -25,5 +25,5 @@
   loop_control:
     loop_var: link
   when:
-    - config_generate.symlinks | length
-    - deploy_operation == "deploy"
\ No newline at end of file
+    - config_generate.symlinks | length > 0
+    - deploy_operation == "deploy"
diff --git a/roles/deploy_code/tasks/deploy.yml b/roles/deploy_code/tasks/deploy.yml
index fc43cc98..d1a09fb6 100644
--- a/roles/deploy_code/tasks/deploy.yml
+++ b/roles/deploy_code/tasks/deploy.yml
@@ -25,7 +25,7 @@
   loop_control:
     loop_var: template
   when:
-    - deploy_code.templates | length
+    - deploy_code.templates | length > 0
     - deploy_operation == 'deploy'
 
 - name: Create additional symlinks in build dir.
@@ -38,7 +38,7 @@
   loop_control:
     loop_var: link
   when:
-    - deploy_code.symlinks | length
+    - deploy_code.symlinks | length > 0
 
 # Additional vhost handling for feature branch builds.
 
diff --git a/roles/deploy_container/tasks/action-create.yml b/roles/deploy_container/tasks/action-create.yml
index 3ec81194..9f4eb522 100644
--- a/roles/deploy_container/tasks/action-create.yml
+++ b/roles/deploy_container/tasks/action-create.yml
@@ -111,7 +111,7 @@
     - name: Use provided VPC id.
       ansible.builtin.set_fact:
         _aws_ecs_cluster_vpc_id: "{{ deploy_container.aws_ecs.vpc_id }}"
-      when: deploy_container.aws_ecs.vpc_name is not defined or (deploy_container.aws_ecs.vpc_name | length) == 0
+      when: (deploy_container.aws_ecs.vpc_name is not defined) or (deploy_container.aws_ecs.vpc_name|length == 0)
 
     - name: Reset subnets lists.
       ansible.builtin.set_fact:
@@ -262,7 +262,7 @@
         _aws_ecs_cluster_listeners: "{{ _aws_ecs_cluster_listeners + deploy_container.aws_ecs.elb_listeners }}"
       when:
         - deploy_container.aws_ecs.elb_listeners is defined
-        - deploy_container.aws_ecs.elb_listeners | length
+        - deploy_container.aws_ecs.elb_listeners | length > 0
 
     - name: Create an ALB.
       amazon.aws.elb_application_lb:
diff --git a/roles/live_symlink/tasks/main.yml b/roles/live_symlink/tasks/main.yml
index 2682e55c..66fa1873 100644
--- a/roles/live_symlink/tasks/main.yml
+++ b/roles/live_symlink/tasks/main.yml
@@ -31,12 +31,12 @@
   loop_control:
     loop_var: template
   when:
-    - live_symlink.templates | length
+    - live_symlink.templates | length > 0
     - deploy_operation == 'deploy'
 
 - name: Handle additional symlinks.
   when:
-    - live_symlink.symlinks | length
+    - live_symlink.symlinks | length > 0
     - deploy_operation == 'deploy'
   block:
     - name: Ensure additional symlink sources exist.
diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml
index 5a77001a..16ab669a 100644
--- a/roles/npm/tasks/main.yml
+++ b/roles/npm/tasks/main.yml
@@ -59,7 +59,7 @@
       loop_control:
         loop_var: template
       when:
-        - npm.templates | length
+        - npm.templates | length > 0
 
     - name: Create additional symlinks.
       ansible.builtin.file:
@@ -71,4 +71,4 @@
       loop_control:
         loop_var: link
       when:
-        - npm.symlinks | length
+        - npm.symlinks | length > 0