diff --git a/backend/app/services/forgejo_issue_sync.py b/backend/app/services/forgejo_issue_sync.py
index e7ef840..d2b58fc 100644
--- a/backend/app/services/forgejo_issue_sync.py
+++ b/backend/app/services/forgejo_issue_sync.py
@@ -123,9 +123,11 @@ class IssueSyncService:
                 except Exception as exc:
                     logger.warning(
                         "issue_detail_sync_failed",
-                        repository_id=str(repository_id),
-                        issue_number=forgejo_number,
-                        error=str(exc),
+                        extra={
+                            "repository_id": str(repository_id),
+                            "issue_number": forgejo_number,
+                            "error": str(exc),
+                        },
                     )
 
                 try:
@@ -139,9 +141,11 @@ class IssueSyncService:
                 except Exception as exc:
                     logger.warning(
                         "issue_comments_sync_failed",
-                        repository_id=str(repository_id),
-                        issue_number=forgejo_number,
-                        error=str(exc),
+                        extra={
+                            "repository_id": str(repository_id),
+                            "issue_number": forgejo_number,
+                            "error": str(exc),
+                        },
                     )
 
                 try:
@@ -155,9 +159,11 @@ class IssueSyncService:
                 except Exception as exc:
                     logger.warning(
                         "issue_timeline_sync_failed",
-                        repository_id=str(repository_id),
-                        issue_number=forgejo_number,
-                        error=str(exc),
+                        extra={
+                            "repository_id": str(repository_id),
+                            "issue_number": forgejo_number,
+                            "error": str(exc),
+                        },
                     )
 
                 try:
@@ -171,9 +177,11 @@ class IssueSyncService:
                 except Exception as exc:
                     logger.warning(
                         "issue_reactions_sync_failed",
-                        repository_id=str(repository_id),
-                        issue_number=forgejo_number,
-                        error=str(exc),
+                        extra={
+                            "repository_id": str(repository_id),
+                            "issue_number": forgejo_number,
+                            "error": str(exc),
+                        },
                     )
 
                 # Parse labels
@@ -302,8 +310,10 @@ class IssueSyncService:
         except Exception as exc:
             logger.warning(
                 "label_sync_failed",
-                repository_id=str(repository_id),
-                error=str(exc),
+                extra={
+                    "repository_id": str(repository_id),
+                    "error": str(exc),
+                },
             )
 
         # Sync repository remote metadata (description, archived, topics, issue count)
@@ -321,8 +331,10 @@ class IssueSyncService:
         except Exception as exc:
             logger.warning(
                 "repo_metadata_sync_failed",
-                repository_id=str(repository_id),
-                error=str(exc),
+                extra={
+                    "repository_id": str(repository_id),
+                    "error": str(exc),
+                },
             )
 
         # Update repository sync metadata
diff --git a/backend/migrations/versions/a7aa29cf8a20_sync_model_drift.py b/backend/migrations/versions/a7aa29cf8a20_sync_model_drift.py
index 7c61a15..3df6cbf 100644
--- a/backend/migrations/versions/a7aa29cf8a20_sync_model_drift.py
+++ b/backend/migrations/versions/a7aa29cf8a20_sync_model_drift.py
@@ -21,7 +21,8 @@ depends_on = None
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_constraint(op.f('fk_activity_events_board_id_boards'), 'activity_events', type_='foreignkey')
-    op.create_foreign_key(None, 'activity_events', 'boards', ['board_id'], ['id'])
+    op.create_foreign_key('fk_activity_events_board_id_boards', 'activity_events', 'boards', ['board_id'], ['id'])
+    op.execute("DELETE FROM agents WHERE gateway_id IS NULL")
     op.alter_column('agents', 'gateway_id',
                existing_type=sa.UUID(),
                nullable=False)
@@ -95,6 +96,6 @@ def downgrade() -> None:
     op.alter_column('agents', 'gateway_id',
                existing_type=sa.UUID(),
                nullable=True)
-    op.drop_constraint(None, 'activity_events', type_='foreignkey')
+    op.drop_constraint('fk_activity_events_board_id_boards', 'activity_events', type_='foreignkey')
     op.create_foreign_key(op.f('fk_activity_events_board_id_boards'), 'activity_events', 'boards', ['board_id'], ['id'], ondelete='CASCADE')
     # ### end Alembic commands ###