diff --git a/api/migrations/versions/2025_05_15_1635-16081485540c_.py b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
new file mode 100644
index 0000000000..70ed771391
--- /dev/null
+++ b/api/migrations/versions/2025_05_15_1635-16081485540c_.py
@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: 16081485540c
+Revises: d28f2004b072
+Create Date: 2025-05-15 16:35:39.113777
+
+"""
+from alembic import op
+import models as models
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '16081485540c'
+down_revision = '58eb7bdb93fe'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('tenant_plugin_auto_upgrade_strategies',
+    sa.Column('id', models.types.StringUUID(), server_default=sa.text('uuid_generate_v4()'), nullable=False),
+    sa.Column('tenant_id', models.types.StringUUID(), nullable=False),
+    sa.Column('strategy_setting', sa.String(length=16), server_default='fix_only', nullable=False),
+    sa.Column('upgrade_time_of_day', sa.Integer(), nullable=False),
+    sa.Column('upgrade_mode', sa.String(length=16), server_default='exclude', nullable=False),
+    sa.Column('exclude_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('include_plugins', sa.ARRAY(sa.String(length=255)), nullable=False),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
+    sa.PrimaryKeyConstraint('id', name='tenant_plugin_auto_upgrade_strategy_pkey'),
+    sa.UniqueConstraint('tenant_id', name='unique_tenant_plugin_auto_upgrade_strategy')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('tenant_plugin_auto_upgrade_strategies')
+    # ### end Alembic commands ###
diff --git a/api/migrations/versions/2025_06_25_1101-46d46b3f389c_merge_tool_oauth_and_remove_sequence_.py b/api/migrations/versions/2025_06_25_1101-46d46b3f389c_merge_tool_oauth_and_remove_sequence_.py
deleted file mode 100644
index a3c51e7e75..0000000000
--- a/api/migrations/versions/2025_06_25_1101-46d46b3f389c_merge_tool_oauth_and_remove_sequence_.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""merge tool oauth and remove sequence number branches
-
-Revision ID: 46d46b3f389c
-Revises: 0ab65e1cc7fa, 71f5020c6470
-Create Date: 2025-06-25 11:01:55.215896
-
-"""
-from alembic import op
-import models as models
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = '46d46b3f389c'
-down_revision = ('0ab65e1cc7fa', '71f5020c6470')
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    pass
-
-
-def downgrade():
-    pass
diff --git a/api/migrations/versions/2025_06_24_1705-71f5020c6470_tool_oauth.py b/api/migrations/versions/2025_07_04_1705-71f5020c6470_tool_oauth.py
similarity index 85%
rename from api/migrations/versions/2025_06_24_1705-71f5020c6470_tool_oauth.py
rename to api/migrations/versions/2025_07_04_1705-71f5020c6470_tool_oauth.py
index ffb4fffe56..32cc08ab1a 100644
--- a/api/migrations/versions/2025_06_24_1705-71f5020c6470_tool_oauth.py
+++ b/api/migrations/versions/2025_07_04_1705-71f5020c6470_tool_oauth.py
@@ -12,7 +12,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '71f5020c6470'
-down_revision = '4474872b0ee6'
+down_revision = '16081485540c'
 branch_labels = None
 depends_on = None
 
@@ -37,29 +37,25 @@ def upgrade():
     sa.PrimaryKeyConstraint('id', name='tool_oauth_tenant_client_pkey'),
     sa.UniqueConstraint('tenant_id', 'plugin_id', 'provider', name='unique_tool_oauth_tenant_client')
     )
-    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-        batch_op.drop_constraint(batch_op.f('unique_api_tool_provider'), type_='unique')
 
     with op.batch_alter_table('tool_builtin_providers', schema=None) as batch_op:
         batch_op.add_column(sa.Column('name', sa.String(length=256), server_default=sa.text("'API KEY 1'::character varying"), nullable=False))
         batch_op.add_column(sa.Column('is_default', sa.Boolean(), server_default=sa.text('false'), nullable=False))
-        batch_op.add_column(sa.Column('credential_type', sa.String(length=32), server_default=sa.text("'api_key'::character varying"), nullable=False))
+        batch_op.add_column(sa.Column('credential_type', sa.String(length=32), server_default=sa.text("'api-key'::character varying"), nullable=False))
         batch_op.drop_constraint(batch_op.f('unique_builtin_tool_provider'), type_='unique')
-
+        batch_op.create_unique_constraint(batch_op.f('unique_builtin_tool_provider'), ['tenant_id', 'provider', 'name'])
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('tool_builtin_providers', schema=None) as batch_op:
+        batch_op.drop_constraint(batch_op.f('unique_builtin_tool_provider'), type_='unique')
         batch_op.create_unique_constraint(batch_op.f('unique_builtin_tool_provider'), ['tenant_id', 'provider'])
         batch_op.drop_column('credential_type')
         batch_op.drop_column('is_default')
         batch_op.drop_column('name')
 
-    with op.batch_alter_table('tool_api_providers', schema=None) as batch_op:
-        batch_op.create_unique_constraint(batch_op.f('unique_api_tool_provider'), ['name', 'tenant_id'])
-
     op.drop_table('tool_oauth_tenant_clients')
     op.drop_table('tool_oauth_system_clients')
     # ### end Alembic commands ###