diff --git a/contrail/manifests/contrail_config.pp b/contrail/manifests/contrail_config.pp
index 1cb3c216..07b38223 100644
--- a/contrail/manifests/contrail_config.pp
+++ b/contrail/manifests/contrail_config.pp
@@ -230,9 +230,9 @@
     # Increase header size accepted as keystone v3 generates large ones.
     if ! defined(Exec["neutron-conf-max-header"]) {
         exec { "neutron-conf-max-header":
-            command => " openstack-config --set /etc/neutron/neutron.conf DEFAULT max_header_line 65536  && service neutron-server restart && echo neutron-conf-max-header >> /etc/contrail/contrail-config-exec.out",
+            command => " openstack-config --set /etc/neutron/neutron.conf DEFAULT max_header_line 65536  && service neutron-server restart && echo neutron-conf-max-header >> /etc/contrail/contrail_config_exec.out",
             onlyif => "test -f /etc/neutron/neutron.conf",
-            unless  => "grep -qx neutron-conf-max-header /etc/contrail/contrail-config-exec.out",
+            unless  => "grep -qx neutron-conf-max-header /etc/contrail/contrail_config_exec.out",
             provider => shell,
             logoutput => "true"
         }
@@ -540,7 +540,7 @@
     }
 
 
-    Package["contrail-openstack-config"]->Setup-haproxy["setup_haproxy"]->Exec["stop-neutron"]->Service["haproxy"]->Exec["exec-cfg-rabbitmq"]->Exec["setup-rabbitmq-cluster"]->Exec["check-rabbitmq-cluster"]->Config-scripts["config-server-setup"]->Config-scripts["quantum-server-setup"]->Exec["setup-verify-quantum-in-keystone"]->Exec["config-neutron-server"]->Exec["neutron-conf-exec"]->Exec["neutron-conf-admin-tenant-exec"]->Exec["provision-metadata-services"]->Exec["provision-encap-type"]->Exec["exec-provision-control"]->Exec["provision-external-bgp"]
+    Package["contrail-openstack-config"]->Setup-haproxy["setup_haproxy"]->Exec["stop-neutron"]->Service["haproxy"]->Exec["exec-cfg-rabbitmq"]->Exec["setup-rabbitmq-cluster"]->Exec["check-rabbitmq-cluster"]->Config-scripts["config-server-setup"]->Config-scripts["quantum-server-setup"]->Exec["setup-verify-quantum-in-keystone"]->Exec["config-neutron-server"]->Exec["provision-metadata-services"]->Exec["provision-encap-type"]->Exec["exec-provision-control"]->Exec["provision-external-bgp"]
 
     # Below is temporary to work-around in Ubuntu as Service resource fails
     # as upstart is not correctly linked to /etc/init.d/service-name
diff --git a/contrail/manifests/contrail_database.pp b/contrail/manifests/contrail_database.pp
index 0be88305..8f53498b 100644
--- a/contrail/manifests/contrail_database.pp
+++ b/contrail/manifests/contrail_database.pp
@@ -122,7 +122,7 @@
         source => "puppet:///modules/$module_name/config-zk-files-setup.sh"
     }
     $contrail_zk_ip_list_for_shell = inline_template('<%= contrail_zookeeper_ip_list.map{ |ip| "#{ip}" }.join(" ") %>')
-    $contrail_zk_exec_cmd = "/bin/bash /etc/contrail/contrail_setup_utils/config-zk-files-setup.sh $operatingsystem $contrail_database_index $contrail_zk_ip_list_for_shell && echo setup-config-zk-files-setup >> /etc/contrail/contrail_database_exec.out"
+    $contrail_zk_exec_cmd = "/bin/bash /etc/contrail/contrail_setup_utils/config-zk-files-setup.sh $operatingsystem $contrail_database_index $contrail_zk_ip_list_for_shell && service zookeeper restart && echo setup-config-zk-files-setup >> /etc/contrail/contrail_database_exec.out"
     notify { "contrail contrail_zk_exec_cmd is $contrail_zk_exec_cmd":; } 
     exec { "setup-config-zk-files-setup" :
         command => $contrail_zk_exec_cmd,