diff --git a/tasks/cinder_db_post_setup.yml b/tasks/cinder_db_post_setup.yml
index 29efc2a1..aacb99f7 100644
--- a/tasks/cinder_db_post_setup.yml
+++ b/tasks/cinder_db_post_setup.yml
@@ -43,7 +43,7 @@
   become: true
   become_user: "{{ cinder_system_user_name }}"
   when:
-    - "ansible_local['openstack_ansible']['cinder']['need_online_data_migrations'] | bool"
+    - ansible_local['openstack_ansible']['cinder']['need_online_data_migrations'] | bool
 
 - name: Disable the online migrations requirement
   delegate_to: "{{ item }}"
diff --git a/tasks/cinder_post_install.yml b/tasks/cinder_post_install.yml
index f44a2cd7..72ce0e6e 100644
--- a/tasks/cinder_post_install.yml
+++ b/tasks/cinder_post_install.yml
@@ -143,8 +143,8 @@
     state: present
   notify: Ensure tgt service restarted
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
-    - "cinder_target_helper == 'tgtadm'"
+    - cinder_services['cinder-volume']['group'] in group_names
+    - cinder_target_helper == 'tgtadm'
     - cinder_backend_lvm_inuse | bool
 
 - name: Ensure iscsi service is started
@@ -153,8 +153,8 @@
     state: started
     enabled: true
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
-    - "cinder_target_helper == 'lioadm'"
+    - cinder_services['cinder-volume']['group'] in group_names
+    - cinder_target_helper == 'lioadm'
     - cinder_backend_lvm_inuse | bool
 
 # NOTE(jrosser) it is necessarry to start the iscsid service to
@@ -165,7 +165,7 @@
     state: started
     enabled: true
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
+    - cinder_services['cinder-volume']['group'] in group_names
     - cinder_backend_lvm_inuse | bool
 
 - name: Create nfs shares export file
@@ -175,7 +175,7 @@
     mode: "0644"
   with_dict: "{{ cinder_backends | default({}) }}"
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
+    - cinder_services['cinder-volume']['group'] in group_names
     - item.value.nfs_shares_config is defined
   tags:
     - cinder-nfs
diff --git a/tasks/main.yml b/tasks/main.yml
index a259c365..e6fb6b8e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -98,8 +98,8 @@
       tags:
         - cinder-config
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
-    - "cinder_backend_lvm_inuse | bool"
+    - cinder_services['cinder-volume']['group'] in group_names
+    - cinder_backend_lvm_inuse | bool
   tags:
     - cinder-config
 
@@ -226,7 +226,7 @@
         password: "{{ cinder_service_password }}"
         role: "{{ cinder_service_role_names }}"
   when:
-    - "_cinder_is_first_play_host"
+    - _cinder_is_first_play_host
   tags:
     - always
 
@@ -240,8 +240,8 @@
     openstack_service_system_user: "{{ cinder_system_user_name }}"
     openstack_service_venv_bin: "{{ (cinder_install_method == 'source') | ternary(cinder_bin, '') }}"
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
-    - "cinder_backend_rbd_inuse | bool"
+    - cinder_services['cinder-volume']['group'] in group_names
+    - cinder_backend_rbd_inuse | bool
   tags:
     - ceph
 
@@ -259,7 +259,7 @@
   retries: 5
   delay: 2
   when:
-    - "cinder_services['cinder-volume']['group'] in group_names"
+    - cinder_services['cinder-volume']['group'] in group_names
 
 - name: Flush handlers
   ansible.builtin.meta: flush_handlers
@@ -271,7 +271,7 @@
       tags:
         - cinder-config
   when:
-    - "_cinder_is_last_play_host"
+    - _cinder_is_last_play_host
   tags:
     - cinder-config
 
@@ -282,8 +282,8 @@
       tags:
         - cinder-config
   when:
-    - "groups[cinder_services['cinder-volume']['group']] | length > 0"
-    - "_cinder_is_last_play_host"
+    - groups[cinder_services['cinder-volume']['group']] | length > 0
+    - _cinder_is_last_play_host | bool
     - cinder_manage_volume_types | bool
   tags:
     - cinder-config