diff --git a/etc/rpc_deploy/user_variables.yml b/etc/rpc_deploy/user_variables.yml
index bc2209fb22..c706c1906c 100644
--- a/etc/rpc_deploy/user_variables.yml
+++ b/etc/rpc_deploy/user_variables.yml
@@ -37,7 +37,6 @@ container_openstack_password:
 
 ## Galera Options
 mysql_root_password:
-mysql_debian_sys_maint_password:
 
 
 ## Keystone Options
diff --git a/rpc_deployment/inventory/group_vars/galera.yml b/rpc_deployment/inventory/group_vars/galera.yml
index 958afba9a2..ff9198fb0c 100644
--- a/rpc_deployment/inventory/group_vars/galera.yml
+++ b/rpc_deployment/inventory/group_vars/galera.yml
@@ -23,8 +23,6 @@ mysql_client_host: 127.0.0.1
 container_lvm_fstype: ext4
 container_lvm_fssize: 5GB
 
-debian_sys_maint_password: "{{ mysql_debian_sys_maint_password }}"
-
 # Size of the galera cache
 galera_gcache_size: 1G
 
diff --git a/rpc_deployment/roles/galera_config/templates/debian.cnf b/rpc_deployment/roles/galera_config/templates/debian.cnf
index ec6aebed17..5d4a0bd7b7 100644
--- a/rpc_deployment/roles/galera_config/templates/debian.cnf
+++ b/rpc_deployment/roles/galera_config/templates/debian.cnf
@@ -1,11 +1,11 @@
 [client]
 host     = localhost
-user     = debian-sys-maint
-password = {{ debian_sys_maint_password }}
+user     = root
+password = {{ mysql_password }}
 socket   = /var/run/mysqld/mysqld.sock
 [mysql_upgrade]
 host     = localhost
-user     = debian-sys-maint
-password = {{ debian_sys_maint_password }}
+user     = root
+password = {{ mysql_password }}
 socket   = /var/run/mysqld/mysqld.sock
 basedir  = /usr
diff --git a/rpc_deployment/roles/galera_setup/tasks/main.yml b/rpc_deployment/roles/galera_setup/tasks/main.yml
index abb3c8f221..098ffffbd2 100644
--- a/rpc_deployment/roles/galera_setup/tasks/main.yml
+++ b/rpc_deployment/roles/galera_setup/tasks/main.yml
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Debian-sys-maint account is used to start/stop mysql. The password is auto
-# generated but must be the same otherwise once data is synced, two nodes
-# will not be able to start/stop mysql.
 - name: Create mysql users
   mysql_user:
     name: "{{ item.name }}"
@@ -36,12 +33,6 @@
       priv: "*.*:ALL"
       state: absent
 
-    - name: "debian-sys-maint"
-      host: 'localhost'
-      password: "{{ debian_sys_maint_password }}"
-      priv: "*.*:ALL"
-      state: present
-
     - name: haproxy
       host: '%'
       password: ""