diff --git a/docker/mariadb/mysql-init/80-add-users.sh b/docker/mariadb/mysql-init/80-add-users.sh
new file mode 100644
index 00000000..4b81c9b4
--- /dev/null
+++ b/docker/mariadb/mysql-init/80-add-users.sh
@@ -0,0 +1,29 @@
+create_arbitrary_users() {
+
+  # Do not care what option is compulsory here, just create what is specified
+  log_info "Creating user specified by (${2}) ..."
+mysql $mysql_flags <<EOSQL
+    CREATE USER '${2}'@'${4}' IDENTIFIED BY '${3}';
+EOSQL
+
+  log_info "Granting privileges to user ${2} for ${1} ..."
+mysql $mysql_flags <<EOSQL
+      GRANT ALL ON \`${1}\`.* TO '${2}'@'${4}' ;
+      FLUSH PRIVILEGES ;
+EOSQL
+}
+
+DB_NO=1
+while [[ ${DB_NO} -ne 0 ]]; do
+    DB_CUR="DB_${DB_NO}"
+    if [[ -n $(eval echo '${!'${DB_CUR}'*}') ]]; then
+        NAME="${DB_CUR}_NAME"
+        USER="${DB_CUR}_USER"
+        PASS="${DB_CUR}_PASS"
+        HOST="${DB_CUR}_HOST"
+        create_arbitrary_users ${!NAME} ${!USER} ${!PASS:-Welcome2KolabSystems} ${!HOST:-127.0.0.1} || true
+        let "DB_NO+=1"
+    else
+        DB_NO=0
+    fi
+done
diff --git a/docker/mariadb/mysql-init/81-update-root-user.sh b/docker/mariadb/mysql-init/81-update-root-user.sh
new file mode 100644
index 00000000..1a0df852
--- /dev/null
+++ b/docker/mariadb/mysql-init/81-update-root-user.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ ! -v ${MYSQL_ROOT_PASSWORD} ]; then
+  log_info "Update root user for host 127.0.0.1 ..."
+mysql $mysql_flags <<EOSQL
+  UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE User = 'root' AND Host = '127.0.0.1';
+  FLUSH PRIVILEGES; 
+EOSQL
+fi
+