diff --git a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
index b40fd09442..ad4a5b03ce 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/EmbedSettings/EmbedSettings_spec.js
@@ -109,8 +109,11 @@ describe("Embed settings options", function () {
     //   } = interception[1].response.body.data;
     //   expect(APPSMITH_ALLOWED_FRAME_ANCESTORS).to.equal("*");
     // });
-    cy.log("deployUrl is " + deployUrl);
-    cy.visit(deployUrl, { timeout: 60000 });
+    cy.get("@deployUrl").then((depUrl) => {
+      cy.log("deployUrl is " + depUrl);
+      deployUrl = depUrl;
+      cy.visit(deployUrl, { timeout: 60000 });
+    });
     getIframeBody().contains("Submit").should("exist");
     ValidateEditModeSetting(_.embedSettings.locators._allowAllText);
   });
@@ -123,8 +126,11 @@ describe("Embed settings options", function () {
     });
     cy.get(adminSettings.saveButton).click();
     cy.waitForServerRestart();
-    cy.log("deployUrl is " + deployUrl);
-    cy.visit(deployUrl, { timeout: 60000 });
+    cy.get("@deployUrl").then((depUrl) => {
+      cy.log("deployUrl is " + depUrl);
+      deployUrl = depUrl;
+      cy.visit(deployUrl, { timeout: 60000 });
+    });
     // TODO: Commented out as it is flaky
     // cy.wait(["@getEnvVariables", "@getEnvVariables"]).then((interception) => {
     //   const {
diff --git a/app/client/src/ce/constants/tenantConstants.ts b/app/client/src/ce/constants/tenantConstants.ts
index 2c12b0a68e..c717001ba0 100644
--- a/app/client/src/ce/constants/tenantConstants.ts
+++ b/app/client/src/ce/constants/tenantConstants.ts
@@ -6,5 +6,5 @@ export const tenantConfigConnection: string[] = [
   "showRolesAndGroups",
 ];
 
-export const RESTART_POLL_TIMEOUT = 2 * 150 * 1000;
+export const RESTART_POLL_TIMEOUT = 2 * 60 * 1000;
 export const RESTART_POLL_INTERVAL = 2000;