diff --git a/config/database.mysql.yml b/config/database.mysql.yml
new file mode 100644
index 000000000..3c68fd081
--- /dev/null
+++ b/config/database.mysql.yml
@@ -0,0 +1,100 @@
+<%
+  if ENV["MIGRATE"].present?
+    mysql_app_user_key = "MYSQL_ALTER_USER"
+    mysql_app_password_key = "MYSQL_ALTER_PASSWORD"
+  else
+    mysql_app_user_key = "MYSQL_APP_USER"
+    mysql_app_password_key = "MYSQL_APP_PASSWORD"
+  end
+
+  mysql_app_user = ENV[mysql_app_user_key]
+  mysql_app_password = ENV[mysql_app_password_key]
+%>
+
+default: &default
+  adapter: trilogy
+  host: <%= ENV.fetch "FIZZY_DB_HOST", "127.0.0.1" %>
+  port: <%= ENV.fetch "FIZZY_DB_PORT", 3306 %>
+  pool: 50
+  timeout: 5000
+  variables:
+    transaction_isolation: READ-COMMITTED
+
+development:
+  primary:
+    <<: *default
+    database: fizzy_development
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+  replica:
+    <<: *default
+    database: fizzy_development
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+    replica: true
+  cable:
+    <<: *default
+    database: development_cable
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+    migrations_paths: db/cable_migrate
+  cache:
+    <<: *default
+    database: development_cache
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+    migrations_paths: db/cache_migrate
+  queue:
+    <<: *default
+    database: development_queue
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+    migrations_paths: db/queue_migrate
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  primary:
+    <<: *default
+    database: fizzy_test
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+  replica:
+    <<: *default
+    database: fizzy_test
+    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
+    replica: true
+
+production: &production
+  primary:
+    <<: *default
+    database: fizzy_production
+    host: <%= ENV["MYSQL_DATABASE_HOST"] %>
+    username: <%= mysql_app_user %>
+    password: <%= mysql_app_password %>
+  replica:
+    <<: *default
+    database: fizzy_production
+    host: <%= ENV["MYSQL_DATABASE_REPLICA_HOST"] %>
+    username: <%= ENV["MYSQL_READONLY_USER"] %>
+    password: <%= ENV["MYSQL_READONLY_PASSWORD"] %>
+    replica: true
+  cable:
+    <<: *default
+    database: fizzy_solidcable_production
+    host: <%= ENV["MYSQL_SOLID_CABLE_HOST"] %>
+    username: <%= mysql_app_user %>
+    password: <%= mysql_app_password %>
+    migrations_paths: db/cable_migrate
+  queue:
+    <<: *default
+    database: fizzy_solidqueue_production
+    host: <%= ENV["MYSQL_SOLID_QUEUE_HOST"] %>
+    username: <%= mysql_app_user %>
+    password: <%= mysql_app_password %>
+    migrations_paths: db/queue_migrate
+  cache:
+    <<: *default
+    database: fizzy_solidcache_production
+    host: <%= ENV["MYSQL_SOLID_CACHE_HOST"] %>
+    username: <%= mysql_app_user %>
+    password: <%= mysql_app_password %>
+    migrations_paths: db/cache_migrate
+
+beta: *production
+staging: *production
diff --git a/config/database.sqlite.yml b/config/database.sqlite.yml
new file mode 100644
index 000000000..44fcda8cc
--- /dev/null
+++ b/config/database.sqlite.yml
@@ -0,0 +1,21 @@
+default: &default
+  adapter: sqlite3
+  pool: 50
+  timeout: 5000
+
+development:
+  primary:
+    <<: *default
+    database: db/development.sqlite3
+    schema_dump: schema_sqlite.rb
+
+test:
+  primary:
+    <<: *default
+    database: db/test.sqlite3
+    schema_dump: schema_sqlite.rb
+
+production:
+  primary:
+    <<: *default
+    database: db/production.sqlite3
diff --git a/config/database.yml b/config/database.yml
index 2a9a3aa2e..84663579d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,123 +1 @@
-<%
-  if ENV["MIGRATE"].present?
-    mysql_app_user_key = "MYSQL_ALTER_USER"
-    mysql_app_password_key = "MYSQL_ALTER_PASSWORD"
-    max_execution_time_ms = 0 # No limit
-  else
-    mysql_app_user_key = "MYSQL_APP_USER"
-    mysql_app_password_key = "MYSQL_APP_PASSWORD"
-    max_execution_time_ms = 5_000
-  end
-
-  mysql_app_user = ENV[mysql_app_user_key]
-  mysql_app_password = ENV[mysql_app_password_key]
-%>
-
-default: &default
-  <% if Fizzy.db_adapter.sqlite? %>
-  adapter: sqlite3
-  pool: 5
-  timeout: 5000
-  <% else %>
-  adapter: trilogy
-  host: <%= ENV.fetch "FIZZY_DB_HOST", "127.0.0.1" %>
-  port: <%= ENV.fetch "FIZZY_DB_PORT", 3306 %>
-  pool: 50
-  timeout: 5000
-  variables:
-    transaction_isolation: READ-COMMITTED
-    max_execution_time: <%= max_execution_time_ms %>
-  <% end %>
-
-development:
-  <% if Fizzy.db_adapter.sqlite? %>
-  primary:
-    <<: *default
-    database: storage/development.sqlite3
-    schema_dump: schema_sqlite.rb
-  <% else %>
-  primary:
-    <<: *default
-    database: fizzy_development
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-  replica:
-    <<: *default
-    database: fizzy_development
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-    replica: true
-  cable:
-    <<: *default
-    database: development_cable
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-    migrations_paths: db/cable_migrate
-  cache:
-    <<: *default
-    database: development_cache
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-    migrations_paths: db/cache_migrate
-  queue:
-    <<: *default
-    database: development_queue
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-    migrations_paths: db/queue_migrate
-  <% end %>
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <% if Fizzy.db_adapter.sqlite? %>
-  primary:
-    <<: *default
-    database: storage/test.sqlite3
-    schema_dump: schema_sqlite.rb
-  <% else %>
-  primary:
-    <<: *default
-    database: fizzy_test
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-  replica:
-    <<: *default
-    database: fizzy_test
-    port: <%= ENV.fetch "FIZZY_DB_PORT", 33380 %>
-    replica: true
-  <% end %>
-
-production: &production
-  primary:
-    <<: *default
-    database: fizzy_production
-    host: <%= ENV["MYSQL_DATABASE_HOST"] %>
-    username: <%= mysql_app_user %>
-    password: <%= mysql_app_password %>
-  replica:
-    <<: *default
-    database: fizzy_production
-    host: <%= ENV["MYSQL_DATABASE_REPLICA_HOST"] %>
-    username: <%= ENV["MYSQL_READONLY_USER"] %>
-    password: <%= ENV["MYSQL_READONLY_PASSWORD"] %>
-    replica: true
-  cable:
-    <<: *default
-    database: fizzy_solidcable_production
-    host: <%= ENV["MYSQL_SOLID_CABLE_HOST"] %>
-    username: <%= mysql_app_user %>
-    password: <%= mysql_app_password %>
-    migrations_paths: db/cable_migrate
-  queue:
-    <<: *default
-    database: fizzy_solidqueue_production
-    host: <%= ENV["MYSQL_SOLID_QUEUE_HOST"] %>
-    username: <%= mysql_app_user %>
-    password: <%= mysql_app_password %>
-    migrations_paths: db/queue_migrate
-  cache:
-    <<: *default
-    database: fizzy_solidcache_production
-    host: <%= ENV["MYSQL_SOLID_CACHE_HOST"] %>
-    username: <%= mysql_app_user %>
-    password: <%= mysql_app_password %>
-    migrations_paths: db/cache_migrate
-
-beta: *production
-staging: *production
+<%= ERB.new(File.read(File.join(__dir__, "database.#{Fizzy.db_adapter}.yml"))).result %>