diff --git a/.dockerignore b/.dockerignore
index 768b297a..3285aafa 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -45,4 +45,4 @@ erl_crash.dump
 /priv/static/cache_manifest.json
 
 # Dev databases
-*.db*
+/data/*.db*
diff --git a/.gitignore b/.gitignore
index 72372b59..9c3ea21f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,5 @@ npm-debug.log
 /assets/node_modules/
 
 # Database files
-*.db
-*.db-*
-
+/data/*.db
+/data/*.db-*
diff --git a/config/dev.exs b/config/dev.exs
index f144f77b..6b59f86b 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -2,7 +2,7 @@ import Config
 
 # Configure your database
 config :music_library, MusicLibrary.Repo,
-  database: Path.expand("../music_library_dev.db", __DIR__),
+  database: Path.expand("../data/music_library_dev.db", __DIR__),
   pool_size: 10,
   stacktrace: true,
   show_sensitive_data_on_connection_error: true
diff --git a/config/test.exs b/config/test.exs
index 3fd7c563..35118303 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -6,7 +6,7 @@ import Config
 # to provide built-in test partitioning in CI environment.
 # Run `mix help test` for more information.
 config :music_library, MusicLibrary.Repo,
-  database: Path.expand("../music_library_test.db", __DIR__),
+  database: Path.expand("../data/music_library_test.db", __DIR__),
   pool_size: 5,
   pool: Ecto.Adapters.SQL.Sandbox
 
diff --git a/data/.gitkeep b/data/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/mix/tasks/music_library/db_pull.ex b/lib/mix/tasks/music_library/db_pull.ex
index c90269b1..7daf574e 100644
--- a/lib/mix/tasks/music_library/db_pull.ex
+++ b/lib/mix/tasks/music_library/db_pull.ex
@@ -13,7 +13,7 @@ defmodule Mix.Tasks.MusicLibrary.DbPull do
 
     current_time = DateTime.utc_now()
     remote_db = "/mnt/music_library/music_library_prod.db"
-    local_db = "music_library_prod_#{DateTime.to_unix(current_time)}.db"
+    local_db = "data/music_library_prod_#{DateTime.to_unix(current_time)}.db"
 
     System.cmd("flyctl", ["ssh", "sftp", "get", remote_db, local_db], into: IO.stream())
 
@@ -21,9 +21,9 @@ defmodule Mix.Tasks.MusicLibrary.DbPull do
 
     IO.puts("Restoring as local dev database")
 
-    Path.wildcard("music_library_dev.db*")
+    Path.wildcard("data/music_library_dev.db*")
     |> Enum.each(&File.rm!/1)
 
-    File.cp!(local_db, "music_library_dev.db")
+    File.cp!(local_db, "data/music_library_dev.db")
   end
 end