diff --git a/packstack/puppet/templates/glance_ceilometer_rabbitmq.pp b/packstack/puppet/templates/glance_ceilometer_rabbitmq.pp
index 21e1ca4bc..45c8cfbb7 100644
--- a/packstack/puppet/templates/glance_ceilometer_rabbitmq.pp
+++ b/packstack/puppet/templates/glance_ceilometer_rabbitmq.pp
@@ -12,12 +12,15 @@ if $kombu_ssl_keyfile {
   }
 }
 class { '::glance::notify::rabbitmq':
-  rabbit_host        => hiera('CONFIG_AMQP_HOST_URL'),
-  rabbit_port        => hiera('CONFIG_AMQP_CLIENTS_PORT'),
-  rabbit_use_ssl     => hiera('CONFIG_AMQP_SSL_ENABLED'),
-  rabbit_userid      => hiera('CONFIG_AMQP_AUTH_USER'),
-  rabbit_password    => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
-  kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
-  kombu_ssl_keyfile  => $kombu_ssl_keyfile,
-  kombu_ssl_certfile => $kombu_ssl_certfile,
+  rabbit_host                  => hiera('CONFIG_AMQP_HOST_URL'),
+  rabbit_notification_exchange => 'glance',
+  rabbit_notification_topic    => 'notifications',
+  rabbit_port                  => hiera('CONFIG_AMQP_CLIENTS_PORT'),
+  rabbit_use_ssl               => hiera('CONFIG_AMQP_SSL_ENABLED'),
+  rabbit_userid                => hiera('CONFIG_AMQP_AUTH_USER'),
+  rabbit_password              => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
+  kombu_ssl_ca_certs           => $kombu_ssl_ca_certs,
+  kombu_ssl_keyfile            => $kombu_ssl_keyfile,
+  kombu_ssl_certfile           => $kombu_ssl_certfile,
+  notification_driver          => 'messagingv2',
 }
diff --git a/packstack/puppet/templates/heat.pp b/packstack/puppet/templates/heat.pp
index cd9fef817..5fce8d066 100644
--- a/packstack/puppet/templates/heat.pp
+++ b/packstack/puppet/templates/heat.pp
@@ -18,10 +18,6 @@ keystone_user_role { "${keystone_admin}@admin":
 }
 
 class { '::heat::keystone::domain':
-  auth_url          => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-  keystone_admin    => $keystone_admin,
-  keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
-  keystone_tenant   => 'admin',
   domain_name       => hiera('CONFIG_HEAT_DOMAIN'),
   domain_admin      => hiera('CONFIG_HEAT_DOMAIN_ADMIN'),
   domain_password   => hiera('CONFIG_HEAT_DOMAIN_PASSWORD'),
diff --git a/packstack/puppet/templates/neutron_metadata.pp b/packstack/puppet/templates/neutron_metadata.pp
index e4dd99ca2..83af14642 100644
--- a/packstack/puppet/templates/neutron_metadata.pp
+++ b/packstack/puppet/templates/neutron_metadata.pp
@@ -1,7 +1,4 @@
 class { '::neutron::agents::metadata':
-  auth_password    => hiera('CONFIG_NEUTRON_KS_PW'),
-  auth_url         => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-  auth_region      => hiera('CONFIG_KEYSTONE_REGION'),
   shared_secret    => hiera('CONFIG_NEUTRON_METADATA_PW'),
   metadata_ip      => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
   debug            => hiera('CONFIG_DEBUG_MODE'),