diff --git a/tasks/nova_compute_wait.yml b/tasks/nova_compute_wait.yml
index 9eae9fe0..533bb851 100644
--- a/tasks/nova_compute_wait.yml
+++ b/tasks/nova_compute_wait.yml
@@ -19,7 +19,7 @@
   register: nova_service_list
   retries: 10
   delay: 5
-  until: "{{ ansible_nodename in (nova_service_list.stdout
-                                  | from_json
-                                  | selectattr('Binary', 'equalto', 'nova-compute')
-                                  | map(attribute='Host') | list) }}"
+  until: "ansible_nodename in (nova_service_list.stdout
+                               | from_json
+                               | selectattr('Binary', 'equalto', 'nova-compute')
+                               | map(attribute='Host') | list)"
diff --git a/tasks/nova_db_post_setup.yml b/tasks/nova_db_post_setup.yml
index 96c18103..22ae9792 100644
--- a/tasks/nova_db_post_setup.yml
+++ b/tasks/nova_db_post_setup.yml
@@ -30,7 +30,7 @@
   shell: "{{ nova_bin }}/nova-manage --config-file /etc/nova/nova.conf cell_v2 list_cells | awk '/{{ nova_cell1_name }}/ {print $4}'"
   become: yes
   become_user: "{{ nova_system_user_name }}"
-  when: "{{ nova_cell1_create.rc == 0 }}"
+  when: "nova_cell1_create.rc == 0"
   register: cell1_uuid
   tags:
     - nova-db-setup
@@ -41,7 +41,7 @@
   command: "{{ nova_bin }}/nova-manage --config-file /etc/nova/nova.conf cell_v2 map_instances --cell_uuid {{ cell1_uuid.stdout }}"
   become: yes
   become_user: "{{ nova_system_user_name }}"
-  when: "{{ nova_cell1_create.rc == 0 }}"
+  when: "nova_cell1_create.rc == 0"
   tags:
     - nova-db-setup
     - nova-setup
diff --git a/tasks/nova_db_setup.yml b/tasks/nova_db_setup.yml
index 21d0dd16..662c5b3c 100644
--- a/tasks/nova_db_setup.yml
+++ b/tasks/nova_db_setup.yml
@@ -51,8 +51,8 @@
   become: yes
   become_user: "{{ nova_system_user_name }}"
   register: nova_cell1_create
-  failed_when: "{{ nova_cell1_create.rc not in [0, 2] }}"
-  changed_when: "{{ nova_cell1_create.rc == 0 }}"
+  failed_when: "nova_cell1_create.rc not in [0, 2]"
+  changed_when: "nova_cell1_create.rc == 0"
   tags:
     - nova-db-setup
     - nova-setup