diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 3ee714f461..be85a02f6d 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -271,6 +271,10 @@ class gerrit(
     }
   }
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
 
   mysql::db { 'reviewdb':
     user     => 'gerrit2',
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 64ab7450c7..ec074f3694 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -209,6 +209,10 @@ class jenkins::slave(
       }
     }
     include mysql::server::account_security
+    mysql::database_user { 'root@::1':
+      ensure  => absent,
+      require => Class['mysql::config'],
+    }
 
     mysql::db { 'openstack_citest':
       user     => 'openstack_citest',
diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index 024e40cc8b..06b7f1fc2b 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -35,6 +35,11 @@ class nodepool (
   }
 
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
+
   include mysql::python
 
   mysql::db { 'nodepool':
diff --git a/modules/openstack_project/manifests/wiki.pp b/modules/openstack_project/manifests/wiki.pp
index 10a95870b8..2d1c7db56b 100644
--- a/modules/openstack_project/manifests/wiki.pp
+++ b/modules/openstack_project/manifests/wiki.pp
@@ -46,6 +46,10 @@ class openstack_project::wiki (
     }
   }
   include mysql::server::account_security
+  mysql::database_user { 'root@::1':
+    ensure  => absent,
+    require => Class['mysql::config'],
+  }
 
   mysql_backup::backup { 'wiki':
     require => Class['mysql::server'],