diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index a6b2d4bc2..addea3a9c 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -222,7 +222,7 @@ enable_galera: true
 mysql_max_connections: '4096'
 tripleo::profile::base::database::mysql::step: 2
 tripleo::profile::base::database::mysql::manage_resources: true
-tripleo::profile::base::database::mysql::remove_default_accounts: false
+tripleo::profile::base::database::mysql::remove_default_accounts: true
 tripleo::profile::base::database::mysql::mysql_server_options:
   'mysqld':
     bind-address: "%{hiera('controller_host')}"