diff --git a/changes/1963.fix.md b/changes/1963.fix.md
new file mode 100644
index 0000000000..044b278dad
--- /dev/null
+++ b/changes/1963.fix.md
@@ -0,0 +1 @@
+Fix `caf54fcc17ab` migration to drop a primary key only if it exists and in `589c764a18f1` migration, add missing table arguments.
\ No newline at end of file
diff --git a/src/ai/backend/manager/models/alembic/versions/589c764a18f1_change_endpoint_to_nullable.py b/src/ai/backend/manager/models/alembic/versions/589c764a18f1_change_endpoint_to_nullable.py
index 77f8a7a301..2f0750048f 100644
--- a/src/ai/backend/manager/models/alembic/versions/589c764a18f1_change_endpoint_to_nullable.py
+++ b/src/ai/backend/manager/models/alembic/versions/589c764a18f1_change_endpoint_to_nullable.py
@@ -54,6 +54,7 @@ def downgrade():
     endpoint_tokens = sa.Table(
         "endpoint_tokens",
         metadata,
+        sa.Column("id", GUID, primary_key=True),
         sa.Column(
             "endpoint", GUID, sa.ForeignKey("endpoints.id", ondelete="SET NULL"), nullable=True
         ),
@@ -61,6 +62,8 @@ def downgrade():
     )
     endpoints = sa.Table(
         "endpoints",
+        metadata,
+        sa.Column("id", GUID, primary_key=True),
         sa.Column("model", GUID, sa.ForeignKey("vfolders.id", ondelete="SET NULL"), nullable=True),
         extend_existing=True,
     )
diff --git a/src/ai/backend/manager/models/alembic/versions/caf54fcc17ab_add_id_columns_to_association_tables.py b/src/ai/backend/manager/models/alembic/versions/caf54fcc17ab_add_id_columns_to_association_tables.py
index c627c846a2..28db77dedf 100644
--- a/src/ai/backend/manager/models/alembic/versions/caf54fcc17ab_add_id_columns_to_association_tables.py
+++ b/src/ai/backend/manager/models/alembic/versions/caf54fcc17ab_add_id_columns_to_association_tables.py
@@ -1,5 +1,7 @@
 """add_id_columns_to_association_tables
 
+Adds ID column to select tables and replaces its Primary Key from pair of data columns to newly created ID column
+
 Revision ID: caf54fcc17ab
 Revises: 8b2ec7e3d22a
 Create Date: 2024-01-03 21:39:50.558724
@@ -36,17 +38,19 @@ def upgrade():
         sa.Column("id", GUID(), server_default=sa.text("uuid_generate_v4()"), nullable=False),
     )
 
-    def drop_existing_pk(idx: str, table: str):
+    def drop_existing_pk(table: str) -> None:
         try:
-            op.drop_constraint(idx, table, type_="primary")
+            # based on age of our constraint naming convention (ai.backend.manager.models.base)
+            # it is safe to assume that every primary key has pk_{table} as its name
+            op.execute(f"ALTER TABLE {table} DROP CONSTRAINT IF EXISTS pk_{table}")
         except sa.exc.ProgrammingError:
             # Skip dropping if the table has no primary key
             pass
 
-    drop_existing_pk("pk_association_groups_users", "association_groups_users")
-    drop_existing_pk("pk_sgroups_for_domains", "sgroups_for_domains")
-    drop_existing_pk("pk_sgroups_for_groups", "sgroups_for_groups")
-    drop_existing_pk("pk_sgroups_for_keypairs", "sgroups_for_keypairs")
+    drop_existing_pk("association_groups_users")
+    drop_existing_pk("sgroups_for_domains")
+    drop_existing_pk("sgroups_for_groups")
+    drop_existing_pk("sgroups_for_keypairs")
 
     op.create_primary_key("pk_association_groups_users", "association_groups_users", ["id"])
     op.create_primary_key("pk_sgroups_for_domains", "sgroups_for_domains", ["id"])