diff --git a/backend/src/ee/services/gateway-v2/gateway-v2-service.ts b/backend/src/ee/services/gateway-v2/gateway-v2-service.ts
index 35f8cdde5..317e5da6d 100644
--- a/backend/src/ee/services/gateway-v2/gateway-v2-service.ts
+++ b/backend/src/ee/services/gateway-v2/gateway-v2-service.ts
@@ -471,7 +471,7 @@ export const gatewayV2ServiceFactory = ({
 
       const gatewayServerKeys = await crypto.nativeCrypto.subtle.generateKey(alg, true, ["sign", "verify"]);
       const gatewayServerCertIssuedAt = new Date();
-      const gatewayServerCertExpireAt = new Date(new Date().setMonth(new Date().getMonth() + 1));
+      const gatewayServerCertExpireAt = new Date(new Date().setDate(new Date().getDate() + 1));
       const gatewayServerCertPrivateKey = crypto.nativeCrypto.KeyObject.from(gatewayServerKeys.privateKey);
 
       const gatewayServerCertExtensions: x509.Extension[] = [
diff --git a/backend/src/ee/services/relay/relay-service.ts b/backend/src/ee/services/relay/relay-service.ts
index 7f0d19e47..92401faaf 100644
--- a/backend/src/ee/services/relay/relay-service.ts
+++ b/backend/src/ee/services/relay/relay-service.ts
@@ -625,7 +625,7 @@ export const relayServiceFactory = ({
 
     const relayServerKeys = await crypto.nativeCrypto.subtle.generateKey(alg, true, ["sign", "verify"]);
     const relayServerCertIssuedAt = new Date();
-    const relayServerCertExpireAt = new Date(new Date().setMonth(new Date().getMonth() + 1));
+    const relayServerCertExpireAt = new Date(new Date().setDate(new Date().getDate() + 1));
     const relayServerCertPrivateKey = crypto.nativeCrypto.KeyObject.from(relayServerKeys.privateKey);
 
     const relayServerCertExtensions: x509.Extension[] = [
@@ -804,7 +804,7 @@ export const relayServiceFactory = ({
         keyId: `client-${relayName}`,
         principals: [gatewayId],
         certType: SshCertType.USER,
-        requestedTtl: "30d"
+        requestedTtl: "1d"
       });
 
       return {