diff --git a/root-common/usr/bin/run-mysqld-master b/root-common/usr/bin/run-mysqld-master
index f8b481e..e343cae 100755
--- a/root-common/usr/bin/run-mysqld-master
+++ b/root-common/usr/bin/run-mysqld-master
@@ -34,7 +34,7 @@ log_info 'Setting passwords ...'
 
 # Setup the 'master' replication on the MySQL server
 mysql $mysql_flags <<EOSQL
-  GRANT REPLICATION SLAVE ON *.* TO '${MYSQL_MASTER_USER}'@'%' IDENTIFIED BY '${MYSQL_MASTER_PASSWORD}';
+  GRANT REPLICATION SLAVE ON *.* TO '${MYSQL_MASTER_USER}'@'%';
   FLUSH PRIVILEGES;
 EOSQL
 
diff --git a/root-common/usr/share/container-scripts/mysql/common.sh b/root-common/usr/share/container-scripts/mysql/common.sh
index 610936f..98840fd 100644
--- a/root-common/usr/share/container-scripts/mysql/common.sh
+++ b/root-common/usr/share/container-scripts/mysql/common.sh
@@ -134,7 +134,7 @@ function initialize_database() {
 
     mysql $mysql_flags <<EOSQL
       CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
-      GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' WITH GRANT OPTION;
+      GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
 EOSQL
   else
     mysql $mysql_flags -e "ALTER USER 'root'@'localhost' IDENTIFIED BY ''";
diff --git a/root-common/usr/share/container-scripts/mysql/init/50-passwd-change.sh b/root-common/usr/share/container-scripts/mysql/init/50-passwd-change.sh
index f93d0d4..1c041b1 100644
--- a/root-common/usr/share/container-scripts/mysql/init/50-passwd-change.sh
+++ b/root-common/usr/share/container-scripts/mysql/init/50-passwd-change.sh
@@ -21,7 +21,7 @@ mysql $mysql_flags <<EOSQL
 EOSQL
     fi
 mysql $mysql_flags <<EOSQL
-      GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' WITH GRANT OPTION;
+      GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
 EOSQL
   else
     if [ "$MYSQL_VERSION" \> "5.6" ] ; then