diff --git a/db/post_migrate/20220325000000_prepare_index_for_ci_job_artifacts_unlocked_with_expire_at.rb b/db/post_migrate/20220325000000_prepare_index_for_ci_job_artifacts_unlocked_with_expire_at.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fa43f3b7f5997d0d206f2a16dfc6dd8d67dae1bc
--- /dev/null
+++ b/db/post_migrate/20220325000000_prepare_index_for_ci_job_artifacts_unlocked_with_expire_at.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PrepareIndexForCiJobArtifactsUnlockedWithExpireAt < Gitlab::Database::Migration[1.0]
+  TABLE_NAME = 'ci_job_artifacts'
+  INDEX_NAME = 'index_ci_job_artifacts_on_expire_at_for_removal'
+  CONDITIONS = 'locked = 0 AND expire_at IS NOT NULL'
+
+  def up
+    prepare_async_index TABLE_NAME, [:expire_at], where: CONDITIONS, name: INDEX_NAME
+  end
+
+  def down
+    unprepare_async_index_by_name TABLE_NAME, INDEX_NAME
+  end
+end
diff --git a/db/schema_migrations/20220325000000 b/db/schema_migrations/20220325000000
new file mode 100644
index 0000000000000000000000000000000000000000..97f93ef57c75bcd495b6f1e357622a796ddfd7e9
--- /dev/null
+++ b/db/schema_migrations/20220325000000
@@ -0,0 +1 @@
+fd738cf8a5642f96dc67a294dcf913d797b580a19f35d5ef76573c63bf2dd920
\ No newline at end of file