diff --git a/alembic/versions/061_add_sort_order_to_template_categories.py b/alembic/versions/061_add_sort_order_to_template_categories.py
new file mode 100644
index 000000000..5cd408981
--- /dev/null
+++ b/alembic/versions/061_add_sort_order_to_template_categories.py
@@ -0,0 +1,26 @@
+"""add sort_order to template_categories
+
+Revision ID: 061_sort_order
+Revises: 060_migrate_segments
+Create Date: 2026-09-02
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "061_sort_order"
+down_revision = "060_migrate_segments"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "template_categories",
+        sa.Column("sort_order", sa.Integer, nullable=False, server_default="0"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("template_categories", "sort_order")
diff --git a/alembic/versions/062_readd_edit_plan_id_to_generation_tasks.py b/alembic/versions/062_readd_edit_plan_id_to_generation_tasks.py
new file mode 100644
index 000000000..781a6b9fa
--- /dev/null
+++ b/alembic/versions/062_readd_edit_plan_id_to_generation_tasks.py
@@ -0,0 +1,28 @@
+"""re-add edit_plan_id to generation_tasks (align staging with production)
+
+Revision ID: 062_edit_plan_id
+Revises: 061_sort_order
+Create Date: 2026-09-02
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "062_edit_plan_id"
+down_revision = "061_sort_order"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "generation_tasks",
+        sa.Column("edit_plan_id", sa.String(36), nullable=True),
+    )
+    op.create_index("ix_generation_tasks_edit_plan_id_2", "generation_tasks", ["edit_plan_id"])
+
+
+def downgrade() -> None:
+    op.drop_index("ix_generation_tasks_edit_plan_id_2", table_name="generation_tasks")
+    op.drop_column("generation_tasks", "edit_plan_id")
diff --git a/packages/adapters/sqlalchemy_impl/models.py b/packages/adapters/sqlalchemy_impl/models.py
index 240bed750..af3712106 100755
--- a/packages/adapters/sqlalchemy_impl/models.py
+++ b/packages/adapters/sqlalchemy_impl/models.py
@@ -289,6 +289,7 @@ class GenerationTaskModel(Base):
     completed_at = Column(DateTime, nullable=True)
     created_by_user_id = Column(String(36), nullable=False, default="", index=True)
     source_edit_plan_id = Column(String(36), nullable=True, index=True)
+    edit_plan_id = Column(String(36), nullable=True, index=True)
     asset_select_mode = Column(String(20), nullable=False, default="")
     batch_id = Column(String(36), nullable=False, default="", index=True)
     video_title = Column(String(255), nullable=False, default="")
@@ -497,6 +498,7 @@ class TemplateCategoryModel(Base):
     id = Column(String(36), primary_key=True)
     user_id = Column(String(36), nullable=False, index=True)
     name = Column(String(100), nullable=False)
+    sort_order = Column(Integer, nullable=False, default=0)
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.now(timezone.utc))