diff --git a/azuracast.dev.env b/azuracast.dev.env
index c8f557508..738455b8e 100644
--- a/azuracast.dev.env
+++ b/azuracast.dev.env
@@ -11,6 +11,10 @@ COMPOSER_PLUGIN_MODE=false
 AUTO_ASSIGN_PORT_MIN=8000
 AUTO_ASSIGN_PORT_MAX=8099
 
+# Database passwords
+MYSQL_PASSWORD=azur4c457
+MYSQL_ROOT_PASSWORD=azur4c457
+
 # Developer options.
 # Populate these!
 INIT_BASE_URL=http://azuracast.local
diff --git a/src/Installer/Command/InstallCommand.php b/src/Installer/Command/InstallCommand.php
index 76f95ff60..1bcc6001f 100644
--- a/src/Installer/Command/InstallCommand.php
+++ b/src/Installer/Command/InstallCommand.php
@@ -112,18 +112,30 @@ class InstallCommand
 
         // Randomize the MariaDB root password for new installs.
         if ($isNewInstall) {
-            if (!$devMode && 'azur4c457' === $azuracastEnv[Environment::DB_PASSWORD]) {
-                $azuracastEnv[Environment::DB_PASSWORD] = Strings::generatePassword(12);
-            }
+            if ($devMode) {
+                if (empty($azuracastEnv['MYSQL_ROOT_PASSWORD'])) {
+                    $azuracastEnv['MYSQL_ROOT_PASSWORD'] = 'azur4c457_root';
+                }
+            } else {
+                if (
+                    empty($azuracastEnv[Environment::DB_PASSWORD])
+                    || 'azur4c457' === $azuracastEnv[Environment::DB_PASSWORD]
+                ) {
+                    $azuracastEnv[Environment::DB_PASSWORD] = Strings::generatePassword(12);
+                }
 
-            if (empty($azuracastEnv['MYSQL_ROOT_PASSWORD'])) {
-                $azuracastEnv['MYSQL_RANDOM_ROOT_PASSWORD'] = 'no';
-                $azuracastEnv['MYSQL_ROOT_PASSWORD'] = ($devMode)
-                    ? 'azur4c457'
-                    : Strings::generatePassword(20);
+                if (empty($azuracastEnv['MYSQL_ROOT_PASSWORD'])) {
+                    $azuracastEnv['MYSQL_ROOT_PASSWORD'] = Strings::generatePassword(20);
+                }
             }
         }
 
+        if (!empty($azuracastEnv['MYSQL_ROOT_PASSWORD'])) {
+            unset($azuracastEnv['MYSQL_RANDOM_ROOT_PASSWORD']);
+        } else {
+            $azuracastEnv['MYSQL_RANDOM_ROOT_PASSWORD'] = 'yes';
+        }
+
         // Display header messages
         if ($isNewInstall) {
             $io->title(
diff --git a/src/Installer/EnvFiles/AzuraCastEnvFile.php b/src/Installer/EnvFiles/AzuraCastEnvFile.php
index 05e9342fe..711aa3ea1 100644
--- a/src/Installer/EnvFiles/AzuraCastEnvFile.php
+++ b/src/Installer/EnvFiles/AzuraCastEnvFile.php
@@ -136,8 +136,6 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'description' => __(
                         'Do not modify this after installation.',
                     ),
-                    'default' => 'yes',
-                    'required' => true,
                 ],
                 'MYSQL_ROOT_PASSWORD' => [
                     'name' => __('MariaDB Root Password'),