diff --git a/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py b/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py
new file mode 100644
index 00000000..f3fc9f5b
--- /dev/null
+++ b/alembic/versions/2024_05_05_0249-c4dca14a5e69_add_org_task_index_for_steps_table.py
@@ -0,0 +1,28 @@
+"""Add org_task_index for steps table
+
+Revision ID: c4dca14a5e69
+Revises: 68d78072fdb5
+Create Date: 2024-05-05 02:49:34.719311+00:00
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "c4dca14a5e69"
+down_revision: Union[str, None] = "68d78072fdb5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_index("org_task_index", "steps", ["organization_id", "task_id"], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index("org_task_index", table_name="steps")
+    # ### end Alembic commands ###
diff --git a/skyvern/forge/sdk/db/models.py b/skyvern/forge/sdk/db/models.py
index 08320483..b23a1677 100644
--- a/skyvern/forge/sdk/db/models.py
+++ b/skyvern/forge/sdk/db/models.py
@@ -54,6 +54,7 @@ class TaskModel(Base):
 
 class StepModel(Base):
     __tablename__ = "steps"
+    __table_args__ = (Index("org_task_index", "organization_id", "task_id"),)
 
     step_id = Column(String, primary_key=True, index=True, default=generate_step_id)
     organization_id = Column(String, ForeignKey("organizations.organization_id"))