diff --git a/cli/src/core/client/client.ts b/cli/src/core/client/client.ts
index 219a7a74b1..c559000177 100644
--- a/cli/src/core/client/client.ts
+++ b/cli/src/core/client/client.ts
@@ -38,6 +38,7 @@ export const CreateClient = (opts: ClientOptions): Client => {
 
     // Interceptors apply to all calls running through this transport.
     interceptors: [],
+    defaultTimeoutMs: 75_000,
   });
 
   return {
diff --git a/controlplane/src/core/build-server.ts b/controlplane/src/core/build-server.ts
index 42d311417c..80cf356a3e 100644
--- a/controlplane/src/core/build-server.ts
+++ b/controlplane/src/core/build-server.ts
@@ -482,7 +482,7 @@ export default async function build(opts: BuildConfig) {
     logLevel: opts.logger.level as pino.LevelWithSilent,
     // Avoid compression for small requests
     compressMinBytes: 1024,
-    maxTimeoutMs: 25_000,
+    maxTimeoutMs: 80_000,
     shutdownTimeoutMs: 30_000,
     // The default limit is the maximum supported value of ~4GiB
     // We go with 32MiB to avoid allocating too much memory for large requests
diff --git a/controlplane/src/core/plugins/clickhouse.ts b/controlplane/src/core/plugins/clickhouse.ts
index 23008c0d01..6b7ac6f7e0 100644
--- a/controlplane/src/core/plugins/clickhouse.ts
+++ b/controlplane/src/core/plugins/clickhouse.ts
@@ -19,7 +19,7 @@ export default fp<ChPluginOptions>(async function ClickHousePlugin(fastify, opts
     dsn: opts.dsn,
     logger: opts.logger,
     httpConfig: {
-      timeout: 20_000,
+      timeout: 60_000,
     },
   });
 
diff --git a/controlplane/src/core/routes.ts b/controlplane/src/core/routes.ts
index 58547112df..02abed2224 100644
--- a/controlplane/src/core/routes.ts
+++ b/controlplane/src/core/routes.ts
@@ -51,7 +51,7 @@ export interface RouterOptions {
   cdnBaseUrl: string;
 }
 const handlerOptions: Partial<ConnectRouterOptions> = {
-  maxTimeoutMs: 25_000,
+  maxTimeoutMs: 80_000,
   jsonOptions: {
     emitDefaultValues: true,
   },