diff --git a/priv/repo/migrations/20230329025816_rename_type_to_class.exs b/priv/repo/migrations/20230329025816_rename_type_to_class.exs
index c66ed1f..f3d5854 100644
--- a/priv/repo/migrations/20230329025816_rename_type_to_class.exs
+++ b/priv/repo/migrations/20230329025816_rename_type_to_class.exs
@@ -2,10 +2,6 @@ defmodule Cannery.Repo.Migrations.RenameTypeToClass do
   use Ecto.Migration
 
   def up do
-    drop index(:ammo_types, [:type])
-
-    flush()
-
     rename table(:ammo_types), :type, to: :class
 
     alter table(:ammo_types) do
@@ -14,8 +10,6 @@ defmodule Cannery.Repo.Migrations.RenameTypeToClass do
 
     flush()
 
-    create index(:ammo_types, [:class])
-
     execute """
     ALTER TABLE ammo_types
       ADD COLUMN search tsvector
@@ -59,10 +53,6 @@ defmodule Cannery.Repo.Migrations.RenameTypeToClass do
   end
 
   def down do
-    drop index(:ammo_types, [:class])
-
-    flush()
-
     rename table(:ammo_types), :class, to: :type
 
     alter table(:ammo_types) do
@@ -71,8 +61,6 @@ defmodule Cannery.Repo.Migrations.RenameTypeToClass do
 
     flush()
 
-    create index(:ammo_types, [:type])
-
     execute """
     ALTER TABLE ammo_types
       ADD COLUMN search TSVECTOR
diff --git a/priv/repo/migrations/20230329041109_rename_ammo_groups_to_packs.exs b/priv/repo/migrations/20230329041109_rename_ammo_groups_to_packs.exs
index dccc8aa..6c6aa23 100644
--- a/priv/repo/migrations/20230329041109_rename_ammo_groups_to_packs.exs
+++ b/priv/repo/migrations/20230329041109_rename_ammo_groups_to_packs.exs
@@ -3,6 +3,7 @@ defmodule Cannery.Repo.Migrations.RenameAmmoGroupsToPacks do
 
   def up do
     drop index(:ammo_groups, [:user_id], where: "count = 0", name: :empty_ammo_groups_index)
+    drop index(:shot_groups, [:user_id, :ammo_group_id])
 
     flush()
 
@@ -25,5 +26,9 @@ defmodule Cannery.Repo.Migrations.RenameAmmoGroupsToPacks do
 
     create index(:ammo_groups, [:user_id], where: "count = 0", name: :empty_ammo_groups_index)
     rename table(:shot_groups), :pack_id, to: :ammo_group_id
+
+    flush()
+
+    create index(:shot_groups, [:user_id, :ammo_group_id])
   end
 end
diff --git a/priv/repo/migrations/20230331004825_rename_shot_groups_to_shot_records.exs b/priv/repo/migrations/20230331004825_rename_shot_groups_to_shot_records.exs
index 1e5cd02..9c909d7 100644
--- a/priv/repo/migrations/20230331004825_rename_shot_groups_to_shot_records.exs
+++ b/priv/repo/migrations/20230331004825_rename_shot_groups_to_shot_records.exs
@@ -1,19 +1,7 @@
 defmodule Cannery.Repo.Migrations.RenameShotGroupsToShotRecords do
   use Ecto.Migration
 
-  def up do
-    drop index(:shot_groups, [:user_id, :pack_id])
-
-    flush()
-
+  def change do
     rename table(:shot_groups), to: table(:shot_records)
   end
-
-  def down do
-    rename table(:shot_records), to: table(:shot_groups)
-
-    flush()
-
-    create index(:shot_groups, [:user_id, :pack_id])
-  end
 end