diff --git a/Makefile b/Makefile
index 7ec5df72c..995d57303 100644
--- a/Makefile
+++ b/Makefile
@@ -61,12 +61,12 @@ snapshots: ##@Development Update (GoLang) Snapshot tests
 
 migration-sql: ##@Development Create an empty SQL migration file
 	@if [ -z "${name}" ]; then echo "Usage: make migration-sql name=name_of_migration_file"; exit 1; fi
-	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name} sql
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migrations create ${name} sql
 .PHONY: migration
 
 migration-go: ##@Development Create an empty Go migration file
 	@if [ -z "${name}" ]; then echo "Usage: make migration-go name=name_of_migration_file"; exit 1; fi
-	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migration create ${name}
+	go run github.com/pressly/goose/v3/cmd/goose@latest -dir db/migrations create ${name}
 .PHONY: migration
 
 setup-dev: setup
diff --git a/db/db.go b/db/db.go
index b1621401f..5055d91cf 100644
--- a/db/db.go
+++ b/db/db.go
@@ -7,7 +7,7 @@ import (
 
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/navidrome/navidrome/conf"
-	_ "github.com/navidrome/navidrome/db/migration"
+	_ "github.com/navidrome/navidrome/db/migrations"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/utils/singleton"
 	"github.com/pressly/goose/v3"
@@ -18,10 +18,10 @@ var (
 	Path   string
 )
 
-//go:embed migration/*.sql
+//go:embed migrations/*.sql
 var embedMigrations embed.FS
 
-const migrationsFolder = "migration"
+const migrationsFolder = "migrations"
 
 func Db() *sql.DB {
 	return singleton.GetInstance(func() *sql.DB {
diff --git a/db/migration/20200130083147_create_schema.go b/db/migrations/20200130083147_create_schema.go
similarity index 100%
rename from db/migration/20200130083147_create_schema.go
rename to db/migrations/20200130083147_create_schema.go
diff --git a/db/migration/20200131183653_standardize_item_type.go b/db/migrations/20200131183653_standardize_item_type.go
similarity index 100%
rename from db/migration/20200131183653_standardize_item_type.go
rename to db/migrations/20200131183653_standardize_item_type.go
diff --git a/db/migration/20200208222418_add_defaults_to_annotations.go b/db/migrations/20200208222418_add_defaults_to_annotations.go
similarity index 100%
rename from db/migration/20200208222418_add_defaults_to_annotations.go
rename to db/migrations/20200208222418_add_defaults_to_annotations.go
diff --git a/db/migration/20200220143731_change_duration_to_float.go b/db/migrations/20200220143731_change_duration_to_float.go
similarity index 100%
rename from db/migration/20200220143731_change_duration_to_float.go
rename to db/migrations/20200220143731_change_duration_to_float.go
diff --git a/db/migration/20200310171621_enable_search_by_albumartist.go b/db/migrations/20200310171621_enable_search_by_albumartist.go
similarity index 100%
rename from db/migration/20200310171621_enable_search_by_albumartist.go
rename to db/migrations/20200310171621_enable_search_by_albumartist.go
diff --git a/db/migration/20200310181627_add_transcoding_and_player_tables.go b/db/migrations/20200310181627_add_transcoding_and_player_tables.go
similarity index 100%
rename from db/migration/20200310181627_add_transcoding_and_player_tables.go
rename to db/migrations/20200310181627_add_transcoding_and_player_tables.go
diff --git a/db/migration/20200319211049_merge_search_into_main_tables.go b/db/migrations/20200319211049_merge_search_into_main_tables.go
similarity index 100%
rename from db/migration/20200319211049_merge_search_into_main_tables.go
rename to db/migrations/20200319211049_merge_search_into_main_tables.go
diff --git a/db/migration/20200325185135_add_album_artist_id.go b/db/migrations/20200325185135_add_album_artist_id.go
similarity index 100%
rename from db/migration/20200325185135_add_album_artist_id.go
rename to db/migrations/20200325185135_add_album_artist_id.go
diff --git a/db/migration/20200326090707_fix_album_artists_importing.go b/db/migrations/20200326090707_fix_album_artists_importing.go
similarity index 100%
rename from db/migration/20200326090707_fix_album_artists_importing.go
rename to db/migrations/20200326090707_fix_album_artists_importing.go
diff --git a/db/migration/20200327193744_add_year_range_to_album.go b/db/migrations/20200327193744_add_year_range_to_album.go
similarity index 100%
rename from db/migration/20200327193744_add_year_range_to_album.go
rename to db/migrations/20200327193744_add_year_range_to_album.go
diff --git a/db/migration/20200404214704_add_indexes.go b/db/migrations/20200404214704_add_indexes.go
similarity index 100%
rename from db/migration/20200404214704_add_indexes.go
rename to db/migrations/20200404214704_add_indexes.go
diff --git a/db/migration/20200409002249_enable_search_by_tracks_artists.go b/db/migrations/20200409002249_enable_search_by_tracks_artists.go
similarity index 100%
rename from db/migration/20200409002249_enable_search_by_tracks_artists.go
rename to db/migrations/20200409002249_enable_search_by_tracks_artists.go
diff --git a/db/migration/20200411164603_add_created_and_updated_fields_to_playlists.go b/db/migrations/20200411164603_add_created_and_updated_fields_to_playlists.go
similarity index 100%
rename from db/migration/20200411164603_add_created_and_updated_fields_to_playlists.go
rename to db/migrations/20200411164603_add_created_and_updated_fields_to_playlists.go
diff --git a/db/migration/20200418110522_reindex_to_fix_album_years.go b/db/migrations/20200418110522_reindex_to_fix_album_years.go
similarity index 100%
rename from db/migration/20200418110522_reindex_to_fix_album_years.go
rename to db/migrations/20200418110522_reindex_to_fix_album_years.go
diff --git a/db/migration/20200419222708_reindex_to_change_full_text_search.go b/db/migrations/20200419222708_reindex_to_change_full_text_search.go
similarity index 100%
rename from db/migration/20200419222708_reindex_to_change_full_text_search.go
rename to db/migrations/20200419222708_reindex_to_change_full_text_search.go
diff --git a/db/migration/20200423204116_add_sort_fields.go b/db/migrations/20200423204116_add_sort_fields.go
similarity index 100%
rename from db/migration/20200423204116_add_sort_fields.go
rename to db/migrations/20200423204116_add_sort_fields.go
diff --git a/db/migration/20200508093059_add_artist_song_count.go b/db/migrations/20200508093059_add_artist_song_count.go
similarity index 100%
rename from db/migration/20200508093059_add_artist_song_count.go
rename to db/migrations/20200508093059_add_artist_song_count.go
diff --git a/db/migration/20200512104202_add_disc_subtitle.go b/db/migrations/20200512104202_add_disc_subtitle.go
similarity index 100%
rename from db/migration/20200512104202_add_disc_subtitle.go
rename to db/migrations/20200512104202_add_disc_subtitle.go
diff --git a/db/migration/20200516140647_add_playlist_tracks_table.go b/db/migrations/20200516140647_add_playlist_tracks_table.go
similarity index 100%
rename from db/migration/20200516140647_add_playlist_tracks_table.go
rename to db/migrations/20200516140647_add_playlist_tracks_table.go
diff --git a/db/migration/20200608153717_referential_integrity.go b/db/migrations/20200608153717_referential_integrity.go
similarity index 100%
rename from db/migration/20200608153717_referential_integrity.go
rename to db/migrations/20200608153717_referential_integrity.go
diff --git a/db/migration/20200706231659_add_default_transcodings.go b/db/migrations/20200706231659_add_default_transcodings.go
similarity index 100%
rename from db/migration/20200706231659_add_default_transcodings.go
rename to db/migrations/20200706231659_add_default_transcodings.go
diff --git a/db/migration/20200710211442_add_playlist_path.go b/db/migrations/20200710211442_add_playlist_path.go
similarity index 100%
rename from db/migration/20200710211442_add_playlist_path.go
rename to db/migrations/20200710211442_add_playlist_path.go
diff --git a/db/migration/20200731095603_create_play_queues_table.go b/db/migrations/20200731095603_create_play_queues_table.go
similarity index 100%
rename from db/migration/20200731095603_create_play_queues_table.go
rename to db/migrations/20200731095603_create_play_queues_table.go
diff --git a/db/migration/20200801101355_create_bookmark_table.go b/db/migrations/20200801101355_create_bookmark_table.go
similarity index 100%
rename from db/migration/20200801101355_create_bookmark_table.go
rename to db/migrations/20200801101355_create_bookmark_table.go
diff --git a/db/migration/20200819111809_drop_email_unique_constraint.go b/db/migrations/20200819111809_drop_email_unique_constraint.go
similarity index 100%
rename from db/migration/20200819111809_drop_email_unique_constraint.go
rename to db/migrations/20200819111809_drop_email_unique_constraint.go
diff --git a/db/migration/20201003111749_add_starred_at_index.go b/db/migrations/20201003111749_add_starred_at_index.go
similarity index 100%
rename from db/migration/20201003111749_add_starred_at_index.go
rename to db/migrations/20201003111749_add_starred_at_index.go
diff --git a/db/migration/20201010162350_add_album_size.go b/db/migrations/20201010162350_add_album_size.go
similarity index 100%
rename from db/migration/20201010162350_add_album_size.go
rename to db/migrations/20201010162350_add_album_size.go
diff --git a/db/migration/20201012210022_add_artist_playlist_size.go b/db/migrations/20201012210022_add_artist_playlist_size.go
similarity index 100%
rename from db/migration/20201012210022_add_artist_playlist_size.go
rename to db/migrations/20201012210022_add_artist_playlist_size.go
diff --git a/db/migration/20201021085410_add_mbids.go b/db/migrations/20201021085410_add_mbids.go
similarity index 100%
rename from db/migration/20201021085410_add_mbids.go
rename to db/migrations/20201021085410_add_mbids.go
diff --git a/db/migration/20201021093209_add_media_file_indexes.go b/db/migrations/20201021093209_add_media_file_indexes.go
similarity index 100%
rename from db/migration/20201021093209_add_media_file_indexes.go
rename to db/migrations/20201021093209_add_media_file_indexes.go
diff --git a/db/migration/20201021135455_add_media_file_artist_index.go b/db/migrations/20201021135455_add_media_file_artist_index.go
similarity index 100%
rename from db/migration/20201021135455_add_media_file_artist_index.go
rename to db/migrations/20201021135455_add_media_file_artist_index.go
diff --git a/db/migration/20201030162009_add_artist_info_table.go b/db/migrations/20201030162009_add_artist_info_table.go
similarity index 100%
rename from db/migration/20201030162009_add_artist_info_table.go
rename to db/migrations/20201030162009_add_artist_info_table.go
diff --git a/db/migration/20201110205344_add_comments_and_lyrics.go b/db/migrations/20201110205344_add_comments_and_lyrics.go
similarity index 100%
rename from db/migration/20201110205344_add_comments_and_lyrics.go
rename to db/migrations/20201110205344_add_comments_and_lyrics.go
diff --git a/db/migration/20201128100726_add_real-path_option.go b/db/migrations/20201128100726_add_real-path_option.go
similarity index 100%
rename from db/migration/20201128100726_add_real-path_option.go
rename to db/migrations/20201128100726_add_real-path_option.go
diff --git a/db/migration/20201213124814_add_all_artist_ids_to_album.go b/db/migrations/20201213124814_add_all_artist_ids_to_album.go
similarity index 100%
rename from db/migration/20201213124814_add_all_artist_ids_to_album.go
rename to db/migrations/20201213124814_add_all_artist_ids_to_album.go
diff --git a/db/migration/20210322132848_add_timestamp_indexes.go b/db/migrations/20210322132848_add_timestamp_indexes.go
similarity index 100%
rename from db/migration/20210322132848_add_timestamp_indexes.go
rename to db/migrations/20210322132848_add_timestamp_indexes.go
diff --git a/db/migration/20210418232815_fix_album_comments.go b/db/migrations/20210418232815_fix_album_comments.go
similarity index 100%
rename from db/migration/20210418232815_fix_album_comments.go
rename to db/migrations/20210418232815_fix_album_comments.go
diff --git a/db/migration/20210430212322_add_bpm_metadata.go b/db/migrations/20210430212322_add_bpm_metadata.go
similarity index 100%
rename from db/migration/20210430212322_add_bpm_metadata.go
rename to db/migrations/20210430212322_add_bpm_metadata.go
diff --git a/db/migration/20210530121921_create_shares_table.go b/db/migrations/20210530121921_create_shares_table.go
similarity index 100%
rename from db/migration/20210530121921_create_shares_table.go
rename to db/migrations/20210530121921_create_shares_table.go
diff --git a/db/migration/20210601231734_update_share_fieldnames.go b/db/migrations/20210601231734_update_share_fieldnames.go
similarity index 100%
rename from db/migration/20210601231734_update_share_fieldnames.go
rename to db/migrations/20210601231734_update_share_fieldnames.go
diff --git a/db/migration/20210616150710_encrypt_all_passwords.go b/db/migrations/20210616150710_encrypt_all_passwords.go
similarity index 100%
rename from db/migration/20210616150710_encrypt_all_passwords.go
rename to db/migrations/20210616150710_encrypt_all_passwords.go
diff --git a/db/migration/20210619231716_drop_player_name_unique_constraint.go b/db/migrations/20210619231716_drop_player_name_unique_constraint.go
similarity index 100%
rename from db/migration/20210619231716_drop_player_name_unique_constraint.go
rename to db/migrations/20210619231716_drop_player_name_unique_constraint.go
diff --git a/db/migration/20210623155401_add_user_prefs_player_scrobbler_enabled.go b/db/migrations/20210623155401_add_user_prefs_player_scrobbler_enabled.go
similarity index 100%
rename from db/migration/20210623155401_add_user_prefs_player_scrobbler_enabled.go
rename to db/migrations/20210623155401_add_user_prefs_player_scrobbler_enabled.go
diff --git a/db/migration/20210625223901_add_referential_integrity_to_user_props.go b/db/migrations/20210625223901_add_referential_integrity_to_user_props.go
similarity index 100%
rename from db/migration/20210625223901_add_referential_integrity_to_user_props.go
rename to db/migrations/20210625223901_add_referential_integrity_to_user_props.go
diff --git a/db/migration/20210626213026_add_scrobble_buffer.go b/db/migrations/20210626213026_add_scrobble_buffer.go
similarity index 100%
rename from db/migration/20210626213026_add_scrobble_buffer.go
rename to db/migrations/20210626213026_add_scrobble_buffer.go
diff --git a/db/migration/20210715151153_add_genre_tables.go b/db/migrations/20210715151153_add_genre_tables.go
similarity index 100%
rename from db/migration/20210715151153_add_genre_tables.go
rename to db/migrations/20210715151153_add_genre_tables.go
diff --git a/db/migration/20210821212604_add_mediafile_channels.go b/db/migrations/20210821212604_add_mediafile_channels.go
similarity index 100%
rename from db/migration/20210821212604_add_mediafile_channels.go
rename to db/migrations/20210821212604_add_mediafile_channels.go
diff --git a/db/migration/20211008205505_add_smart_playlist.go b/db/migrations/20211008205505_add_smart_playlist.go
similarity index 100%
rename from db/migration/20211008205505_add_smart_playlist.go
rename to db/migrations/20211008205505_add_smart_playlist.go
diff --git a/db/migration/20211023184825_add_order_title_to_media_file.go b/db/migrations/20211023184825_add_order_title_to_media_file.go
similarity index 100%
rename from db/migration/20211023184825_add_order_title_to_media_file.go
rename to db/migrations/20211023184825_add_order_title_to_media_file.go
diff --git a/db/migration/20211026191915_unescape_lyrics_and_comments.go b/db/migrations/20211026191915_unescape_lyrics_and_comments.go
similarity index 100%
rename from db/migration/20211026191915_unescape_lyrics_and_comments.go
rename to db/migrations/20211026191915_unescape_lyrics_and_comments.go
diff --git a/db/migration/20211029213200_add_userid_to_playlist.go b/db/migrations/20211029213200_add_userid_to_playlist.go
similarity index 100%
rename from db/migration/20211029213200_add_userid_to_playlist.go
rename to db/migrations/20211029213200_add_userid_to_playlist.go
diff --git a/db/migration/20211102215414_add_alphabetical_by_artist_index.go b/db/migrations/20211102215414_add_alphabetical_by_artist_index.go
similarity index 100%
rename from db/migration/20211102215414_add_alphabetical_by_artist_index.go
rename to db/migrations/20211102215414_add_alphabetical_by_artist_index.go
diff --git a/db/migration/20211105162746_remove_invalid_artist_ids.go b/db/migrations/20211105162746_remove_invalid_artist_ids.go
similarity index 100%
rename from db/migration/20211105162746_remove_invalid_artist_ids.go
rename to db/migrations/20211105162746_remove_invalid_artist_ids.go
diff --git a/db/migration/20220724231849_add_musicbrainz_release_track_id.go b/db/migrations/20220724231849_add_musicbrainz_release_track_id.go
similarity index 100%
rename from db/migration/20220724231849_add_musicbrainz_release_track_id.go
rename to db/migrations/20220724231849_add_musicbrainz_release_track_id.go
diff --git a/db/migration/20221219112733_add_album_image_paths.go b/db/migrations/20221219112733_add_album_image_paths.go
similarity index 100%
rename from db/migration/20221219112733_add_album_image_paths.go
rename to db/migrations/20221219112733_add_album_image_paths.go
diff --git a/db/migration/20221219140528_remove_cover_art_id.go b/db/migrations/20221219140528_remove_cover_art_id.go
similarity index 100%
rename from db/migration/20221219140528_remove_cover_art_id.go
rename to db/migrations/20221219140528_remove_cover_art_id.go
diff --git a/db/migration/20230112111457_add_album_paths.go b/db/migrations/20230112111457_add_album_paths.go
similarity index 100%
rename from db/migration/20230112111457_add_album_paths.go
rename to db/migrations/20230112111457_add_album_paths.go
diff --git a/db/migration/20230114121537_touch_playlists.go b/db/migrations/20230114121537_touch_playlists.go
similarity index 100%
rename from db/migration/20230114121537_touch_playlists.go
rename to db/migrations/20230114121537_touch_playlists.go
diff --git a/db/migration/20230115103212_create_internet_radio.go b/db/migrations/20230115103212_create_internet_radio.go
similarity index 100%
rename from db/migration/20230115103212_create_internet_radio.go
rename to db/migrations/20230115103212_create_internet_radio.go
diff --git a/db/migration/20230117155559_add_replaygain_metadata.go b/db/migrations/20230117155559_add_replaygain_metadata.go
similarity index 100%
rename from db/migration/20230117155559_add_replaygain_metadata.go
rename to db/migrations/20230117155559_add_replaygain_metadata.go
diff --git a/db/migration/20230117180400_add_album_info.go b/db/migrations/20230117180400_add_album_info.go
similarity index 100%
rename from db/migration/20230117180400_add_album_info.go
rename to db/migrations/20230117180400_add_album_info.go
diff --git a/db/migration/20230119152657_recreate_share_table.go b/db/migrations/20230119152657_recreate_share_table.go
similarity index 100%
rename from db/migration/20230119152657_recreate_share_table.go
rename to db/migrations/20230119152657_recreate_share_table.go
diff --git a/db/migration/20230202143713_change_path_list_separator.go b/db/migrations/20230202143713_change_path_list_separator.go
similarity index 100%
rename from db/migration/20230202143713_change_path_list_separator.go
rename to db/migrations/20230202143713_change_path_list_separator.go
diff --git a/db/migration/20230209181414_change_image_files_list_separator.go b/db/migrations/20230209181414_change_image_files_list_separator.go
similarity index 100%
rename from db/migration/20230209181414_change_image_files_list_separator.go
rename to db/migrations/20230209181414_change_image_files_list_separator.go
diff --git a/db/migration/20230310222612_add_download_to_share.go b/db/migrations/20230310222612_add_download_to_share.go
similarity index 100%
rename from db/migration/20230310222612_add_download_to_share.go
rename to db/migrations/20230310222612_add_download_to_share.go
diff --git a/db/migration/20230404104309_empty_sql_migration.sql b/db/migrations/20230404104309_empty_sql_migration.sql
similarity index 100%
rename from db/migration/20230404104309_empty_sql_migration.sql
rename to db/migrations/20230404104309_empty_sql_migration.sql
diff --git a/db/migration/20230515184510_add_release_date.go b/db/migrations/20230515184510_add_release_date.go
similarity index 100%
rename from db/migration/20230515184510_add_release_date.go
rename to db/migrations/20230515184510_add_release_date.go
diff --git a/db/migration/20230616214944_rename_musicbrainz_recording_id.go b/db/migrations/20230616214944_rename_musicbrainz_recording_id.go
similarity index 100%
rename from db/migration/20230616214944_rename_musicbrainz_recording_id.go
rename to db/migrations/20230616214944_rename_musicbrainz_recording_id.go
diff --git a/db/migration/20231208182311_add_discs_to_album.go b/db/migrations/20231208182311_add_discs_to_album.go
similarity index 100%
rename from db/migration/20231208182311_add_discs_to_album.go
rename to db/migrations/20231208182311_add_discs_to_album.go
diff --git a/db/migration/20231209211223_alter_lyric_column.go b/db/migrations/20231209211223_alter_lyric_column.go
similarity index 100%
rename from db/migration/20231209211223_alter_lyric_column.go
rename to db/migrations/20231209211223_alter_lyric_column.go
diff --git a/db/migration/20240122223340_add_default_values_to_null_columns.go.go b/db/migrations/20240122223340_add_default_values_to_null_columns.go.go
similarity index 100%
rename from db/migration/20240122223340_add_default_values_to_null_columns.go.go
rename to db/migrations/20240122223340_add_default_values_to_null_columns.go.go
diff --git a/db/migration/20240426202913_add_id_to_scrobble_buffer.go b/db/migrations/20240426202913_add_id_to_scrobble_buffer.go
similarity index 100%
rename from db/migration/20240426202913_add_id_to_scrobble_buffer.go
rename to db/migrations/20240426202913_add_id_to_scrobble_buffer.go
diff --git a/db/migration/migration.go b/db/migrations/migration.go
similarity index 100%
rename from db/migration/migration.go
rename to db/migrations/migration.go
diff --git a/reflex.conf b/reflex.conf
index c25b1662a..2eb4d131c 100644
--- a/reflex.conf
+++ b/reflex.conf
@@ -1 +1 @@
--s -r "(\.go$$|\.cpp$$|\.h$$|navidrome.toml|resources|token_received.html)" -R "(^ui|^data|^db/migration)" -- go run -race -tags netgo .
+-s -r "(\.go$$|\.cpp$$|\.h$$|navidrome.toml|resources|token_received.html)" -R "(^ui|^data|^db/migrations)" -- go run -race -tags netgo .