diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3e6c130..06aad3ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixes
+- Change connection manager upsert timeout to 5 minutes
+
 ## [3.0.1] - 2025-04-01
 
 ### Fixes
diff --git a/packages/backend/src/env.ts b/packages/backend/src/env.ts
index 88c8e3ef..472bcec2 100644
--- a/packages/backend/src/env.ts
+++ b/packages/backend/src/env.ts
@@ -44,7 +44,7 @@ export const env = createEnv({
         DATABASE_URL: z.string().url().default("postgresql://postgres:postgres@localhost:5432/postgres"),
         CONFIG_PATH: z.string().optional(),
 
-        CONNECTION_MANAGER_UPSERT_TIMEOUT_MS: numberSchema.default(10000),
+        CONNECTION_MANAGER_UPSERT_TIMEOUT_MS: numberSchema.default(300000),
     },
     runtimeEnv: process.env,
     emptyStringAsUndefined: true,