diff --git a/deployment_scripts/database_hiera_override.pp b/deployment_scripts/database_hiera_override.pp
index 5c53edb..3b5db2f 100644
--- a/deployment_scripts/database_hiera_override.pp
+++ b/deployment_scripts/database_hiera_override.pp
@@ -12,7 +12,7 @@ if $detach_database_plugin {
   }
   $yaml_additional_config = pick($detach_database_plugin['yaml_additional_config'], {})
   #TODO (holser): Redesign parseyaml and is_bool once [MODULES-2462] applied
-  $settings_hash       = parseyaml($detach_keystone_plugin['yaml_additional_config'])
+  $settings_hash       = parseyaml($detach_database_plugin['yaml_additional_config'])
 
   if is_bool($settings_hash) {
     $settings_hash_real = {}
@@ -22,7 +22,7 @@ if $detach_database_plugin {
 
   $nodes_hash = hiera('nodes')
   $management_vip = hiera('management_vip')
-  $database_vip = pick($settings_real_hash['remote_database'],$network_metadata['vips']['database']['ipaddr'])
+  $database_vip = pick($settings_hash_real['remote_database'],$network_metadata['vips']['database']['ipaddr'])
 
   #Set database_nodes values
   $database_roles = [ 'primary-standalone-database', 'standalone-database' ]