diff --git a/manifests/murano.pp b/manifests/murano.pp
index 07fa83d0e..d4044a7d7 100644
--- a/manifests/murano.pp
+++ b/manifests/murano.pp
@@ -49,8 +49,12 @@ class openstack_integration::murano {
   class { 'murano::db':
     database_connection => 'mysql+pymysql://murano:a_big_secret@127.0.0.1/murano?charset=utf8',
   }
+  class { 'murano::keystone::authtoken':
+    auth_url             => $::openstack_integration::config::keystone_admin_uri,
+    www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
+    password             => 'a_big_secret'
+  }
   class { 'murano':
-    admin_password        => 'a_big_secret',
     default_transport_url => os_transport_url({
       'transport' => $::openstack_integration::config::messaging_default_proto,
       'host'      => $::openstack_integration::config::host,
@@ -65,8 +69,6 @@ class openstack_integration::murano {
     rabbit_own_host       => $::openstack_integration::config::host,
     rabbit_own_port       => $::openstack_integration::config::rabbit_port,
     rabbit_own_use_ssl    => $::openstack_integration::config::ssl,
-    identity_uri          => $::openstack_integration::config::keystone_admin_uri,
-    www_authenticate_uri  => $::openstack_integration::config::keystone_auth_uri,
     use_ssl               => $::openstack_integration::config::ssl,
     service_host          => $::openstack_integration::config::ip_for_url,
     cert_file             => $::openstack_integration::params::cert_path,