diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql
new file mode 100644
index 000000000..a888d3461
--- /dev/null
+++ b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql
@@ -0,0 +1,6 @@
+-- atlas:txmode none
+
+-- Drop index "workflowrun_state_created_at" from table: "workflow_runs"
+DROP INDEX "workflowrun_state_created_at";
+-- Create index "workflowrun_state_created_at" to table: "workflow_runs"
+CREATE INDEX CONCURRENTLY "workflowrun_state_created_at" ON "workflow_runs" ("state", "created_at");
diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum
index bf17318b1..8d8c5a62c 100644
--- a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum
+++ b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum
@@ -1,4 +1,4 @@
-h1:aDLoUdZ7A/XcJmyQg4Qia82eQ6BN67RfTrTVh+uZoHo=
+h1:zMUQdCsdxlu5WHgd4G0cKNp4VzU0ViSDSSMojr38oXQ=
 20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M=
 20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g=
 20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI=
@@ -112,3 +112,4 @@ h1:aDLoUdZ7A/XcJmyQg4Qia82eQ6BN67RfTrTVh+uZoHo=
 20250820171503.sql h1:SsLD5Tf6woeFE7/FLI9XVQpnEgx4CJ9d7fWwNOZvOrA=
 20250827093032.sql h1:K+XDWewSLoGBM+zjkBMag3mMQFFQyoQ9SePzfRxC694=
 20250902095134.sql h1:e1DP8uYf/CX7RCiCF+E2/TKXiFUR6EUQBPy0wh5Xxl0=
+20250908160222.sql h1:bNjptbt2xPpSXqa4eVuWkMnovHt9LMkiakoGrFGZJ0g=
diff --git a/app/controlplane/pkg/data/ent/migrate/schema.go b/app/controlplane/pkg/data/ent/migrate/schema.go
index 8a0d04f64..08512d7ad 100644
--- a/app/controlplane/pkg/data/ent/migrate/schema.go
+++ b/app/controlplane/pkg/data/ent/migrate/schema.go
@@ -813,11 +813,6 @@ var (
 				Name:    "workflowrun_state_created_at",
 				Unique:  false,
 				Columns: []*schema.Column{WorkflowRunsColumns[3], WorkflowRunsColumns[1]},
-				Annotation: &entsql.IndexAnnotation{
-					DescColumns: map[string]bool{
-						WorkflowRunsColumns[1].Name: true,
-					},
-				},
 			},
 			{
 				Name:    "workflowrun_state_finished_at",
diff --git a/app/controlplane/pkg/data/ent/schema/workflowrun.go b/app/controlplane/pkg/data/ent/schema/workflowrun.go
index e36bbf781..c0cde4364 100644
--- a/app/controlplane/pkg/data/ent/schema/workflowrun.go
+++ b/app/controlplane/pkg/data/ent/schema/workflowrun.go
@@ -84,7 +84,7 @@ func (WorkflowRun) Indexes() []ent.Index {
 		index.Fields("workflow_id", "created_at").Annotations(entsql.DescColumns("created_at")),
 		index.Fields("workflow_id", "state", "created_at").Annotations(entsql.DescColumns("created_at")),
 		// Expiration job
-		index.Fields("state", "created_at").Annotations(entsql.DescColumns("created_at")),
+		index.Fields("state", "created_at"),
 		// search and order by finish date
 		index.Fields("state", "finished_at"),
 		// Referrer