diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml
index 4a1b4df2..81fda2e1 100644
--- a/tasks/neutron_install.yml
+++ b/tasks/neutron_install.yml
@@ -142,7 +142,7 @@
   delay: 2
   notify: Restart neutron services
 
-- name: Initialise the db sync local facts
+- name: Initialise the upgrade facts
   ini_file:
     dest: "/etc/ansible/facts.d/openstack_ansible.fact"
     section: neutron
@@ -153,10 +153,15 @@
       state: "True"
     - name: "need_db_contract"
       state: "True"
-  when: neutron_get_venv | changed or
-        neutron_venv_dir | changed or
-        install_packages | changed or
-        install_optional_packages | changed
+  when: (neutron_get_venv | changed) or
+        (neutron_venv_dir | changed) or
+        (install_packages | changed) or
+        (install_optional_packages | changed) or
+        (ansible_local is not defined) or
+        ('openstack_ansible' not in ansible_local) or
+        ('neutron' not in ansible_local['openstack_ansible']) or
+        ('need_db_expand' not in ansible_local['openstack_ansible']['neutron']) or
+        ('need_db_contract' not in ansible_local['openstack_ansible']['neutron'])
 
 - name: Record the venv tag deployed
   ini_file: