diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 35a7a6cc..079de422 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -46,7 +46,7 @@ class cloud::network::controller(
   # We check if DB tables are created, if not we populate Neutron DB.
   # It's a hack to fit with our setup where we run MySQL/Galera
   exec {'neutron_db_sync':
-    command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
+    command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade havana',
     unless  => "/usr/bin/mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | /bin/grep Tables"
   }
 
diff --git a/spec/classes/cloud_network_controller_spec.rb b/spec/classes/cloud_network_controller_spec.rb
index a8904938..c861e557 100644
--- a/spec/classes/cloud_network_controller_spec.rb
+++ b/spec/classes/cloud_network_controller_spec.rb
@@ -90,7 +90,7 @@ describe 'cloud::network::controller' do
 
     it 'checks if Neutron DB is populated' do
       should contain_exec('neutron_db_sync').with(
-        :command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
+        :command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade havana',
         :unless  => '/usr/bin/mysql neutron -h 10.0.0.1 -u neutron -psecrete -e "show tables" | /bin/grep Tables'
       )
     end