diff --git a/resources/stacks/drupal7/settings.local.php b/resources/stacks/drupal7/settings.local.php
index 82d1f4d..283fbd8 100644
--- a/resources/stacks/drupal7/settings.local.php
+++ b/resources/stacks/drupal7/settings.local.php
@@ -35,8 +35,8 @@
       'driver' => 'mysql',
       'host' => '127.0.0.1',
       'port' => $port,
-      'username' => 'mysql',
-      'password' => 'mysql',
+      'username' => '{{ mysql_user }}',
+      'password' => '{{ mysql_password }}',
       'database' => 'data',
       'prefix' => '',
     );
diff --git a/resources/stacks/drupal8/settings.local.php b/resources/stacks/drupal8/settings.local.php
index ccb00eb..c1c2575 100644
--- a/resources/stacks/drupal8/settings.local.php
+++ b/resources/stacks/drupal8/settings.local.php
@@ -39,8 +39,8 @@
       'driver' => 'mysql',
       'host' => '127.0.0.1',
       'port' => $port,
-      'username' => 'mysql',
-      'password' => 'mysql',
+      'username' => '{{ mysql_user }}',
+      'password' => '{{ mysql_password }}',
       'database' => 'data',
       'prefix' => '',
       'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
diff --git a/src/Docker/ComposeContainers.php b/src/Docker/ComposeContainers.php
index f33a4c1..79514dd 100644
--- a/src/Docker/ComposeContainers.php
+++ b/src/Docker/ComposeContainers.php
@@ -4,6 +4,7 @@
 
 
 use mglaman\PlatformDocker\Config;
+use mglaman\PlatformDocker\Mysql\Mysql;
 use mglaman\PlatformDocker\Platform;
 use Symfony\Component\Yaml\Yaml;
 
@@ -91,12 +92,16 @@ public function addDatabase()
           ],
           'environment' => [
             'MYSQL_DATABASE' => 'data',
-            'MYSQL_USER' => 'mysql',
-            'MYSQL_PASSWORD' => 'mysql',
             'MYSQL_ALLOW_EMPTY_PASSWORD' => 'yes',
-            'MYSQL_ROOT_PASSWORD' => 'root,'
+            'MYSQL_ROOT_PASSWORD' => Mysql::getMysqlRootPassword(),
           ],
         ];
+
+        $user = Mysql::getMysqlUser();
+        if (strcasecmp($user, 'root') !== 0) {
+            $this->config['mariadb']['environment']['MYSQL_USER'] = $user;
+            $this->config['mariadb']['environment']['MYSQL_PASSWORD'] = Mysql::getMysqlPassword();
+        }
     }
 
     /**
diff --git a/src/Mysql/Mysql.php b/src/Mysql/Mysql.php
new file mode 100644
index 0000000..058882b
--- /dev/null
+++ b/src/Mysql/Mysql.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace mglaman\PlatformDocker\Mysql;
+
+/**
+ * Static methods to get info about the local mysql environment.
+ *
+ * We need to read .my.cnf files if they exist and use the user information from it. This is because of a bug in the
+ * most recent versions of Drush that is unlikely to be ported to Drush 8 or 7.
+ *
+ * @see https://github.com/drush-ops/drush/pull/2387
+ */
+class Mysql
+{
+
+    /**
+     * The mysql user to use.
+     *
+     * @return string
+     */
+    public static function getMysqlUser() {
+        $my_cnf = [];
+        $my_cnf_file = static::getUserDirectory() . '/.my.cnf';
+        if (file_exists($my_cnf_file)) {
+            $my_cnf = parse_ini_file($my_cnf_file);
+        }
+        return isset($my_cnf['user']) && $my_cnf['user'] !== 'root' ? $my_cnf['user'] : 'mysql';
+    }
+
+    /**
+     * The mysql password to use.
+     *
+     * @return string
+     */
+    public static function getMysqlPassword() {
+        $my_cnf = [];
+        $my_cnf_file = static::getUserDirectory() . '/.my.cnf';
+        if (file_exists($my_cnf_file)) {
+            $my_cnf = parse_ini_file($my_cnf_file);
+        }
+        return isset($my_cnf['password'], $my_cnf['user']) && $my_cnf['user'] !== 'root' ? $my_cnf['password'] : 'mysql';
+    }
+
+    /**
+     * The mysql root password to use.
+     *
+     * @return string
+     */
+    public static function getMysqlRootPassword() {
+        $password = 'root,';
+        $my_cnf_file = static::getUserDirectory() . '/.my.cnf';
+        if (file_exists($my_cnf_file)) {
+            $my_cnf = parse_ini_file($my_cnf_file);
+            if (isset($my_cnf['password'], $my_cnf['user']) && $my_cnf['user'] === 'root') {
+                $password = $my_cnf['password'];
+            }
+        }
+        return $password;
+    }
+
+    /**
+     * @return string The formal user home as detected from environment parameters
+     * @throws \RuntimeException If the user home could not reliably be determined
+     */
+    public static function getUserDirectory()
+    {
+        if (false !== ($home = getenv('HOME'))) {
+            return $home;
+        }
+        if (defined('PHP_WINDOWS_VERSION_BUILD') && false !== ($home = getenv('USERPROFILE'))) {
+            return $home;
+        }
+        if (function_exists('posix_getuid') && function_exists('posix_getpwuid')) {
+            $info = posix_getpwuid(posix_getuid());
+            return $info['dir'];
+        }
+        throw new \RuntimeException('Could not determine user directory');
+    }
+}
diff --git a/src/Stacks/Drupal.php b/src/Stacks/Drupal.php
index a88bff7..3611529 100644
--- a/src/Stacks/Drupal.php
+++ b/src/Stacks/Drupal.php
@@ -2,7 +2,7 @@
 
 namespace mglaman\PlatformDocker\Stacks;
 
-
+use mglaman\PlatformDocker\Mysql\Mysql;
 use mglaman\Toolstack\Toolstack;
 use mglaman\Toolstack\Stacks\Drupal as DrupalStackHelper;
 use mglaman\PlatformDocker\Platform;
@@ -92,7 +92,8 @@ protected function ensureLocalSettings() {
         $localSettings = str_replace('{{ container_name }}', $this->containerName, $localSettings);
         $localSettings = str_replace('{{ redis_container_name }}', $this->redisContainerName, $localSettings);
         $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
-        $localSettings = str_replace('{{ project_domain }}', $this->projectName . '.' . $this->projectTld, $localSettings);
+        $localSettings = str_replace('{{ mysql_user }}', Mysql::getMysqlUser(), $localSettings);
+        $localSettings = str_replace('{{ mysql_password }}', Mysql::getMysqlPassword(), $localSettings);
         file_put_contents(Platform::sharedDir() . '/settings.local.php', $localSettings);
 
         // Relink if missing.