diff --git a/api/src/backend/api/migrations/0028_findings_check_index_partitions.py b/api/src/backend/api/migrations/0028_findings_check_index_partitions.py
index ad61f3004f..cb202e019c 100644
--- a/api/src/backend/api/migrations/0028_findings_check_index_partitions.py
+++ b/api/src/backend/api/migrations/0028_findings_check_index_partitions.py
@@ -1,8 +1,6 @@
-from functools import partial
-
 from django.db import migrations
 
-from api.db_utils import create_index_on_partitions, drop_index_on_partitions
+from api.operations import CreatePartitionedIndex
 
 
 class Migration(migrations.Migration):
@@ -13,17 +11,12 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(
-            partial(
-                create_index_on_partitions,
-                parent_table="findings",
-                index_name="find_tenant_scan_check_idx",
-                columns="tenant_id, scan_id, check_id",
-            ),
-            reverse_code=partial(
-                drop_index_on_partitions,
-                parent_table="findings",
-                index_name="find_tenant_scan_check_idx",
-            ),
+        CreatePartitionedIndex(
+            parent_table="findings",
+            index_name="find_tenant_scan_check_idx",
+            columns="tenant_id, scan_id, check_id",
+            method="BTREE",
+            all_partitions=False,
+            create_parent_index=True,
         )
     ]
diff --git a/api/src/backend/api/migrations/0029_findings_check_index_parent.py b/api/src/backend/api/migrations/0029_findings_check_index_parent.py
index 8b975782f1..fb70ad5d0b 100644
--- a/api/src/backend/api/migrations/0029_findings_check_index_parent.py
+++ b/api/src/backend/api/migrations/0029_findings_check_index_parent.py
@@ -1,4 +1,4 @@
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -7,11 +7,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AddIndex(
-            model_name="finding",
-            index=models.Index(
-                fields=["tenant_id", "scan_id", "check_id"],
-                name="find_tenant_scan_check_idx",
-            ),
-        ),
+        # No-op: Index managed manually via CratePartitionedIndex in the previous migrations
+        # Deprecated
     ]