diff --git a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
index 5644bd19b4..080e83f41f 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutations/managing_secrets.js
@@ -1,13 +1,15 @@
-const number = crypto.getRandomValues(new Uint32Array(1))[0];
-const accound_id = `account${number}`;
-const warehouse_id = `warehouse${number}`;
-const username = `user${number}`;
-const password = `password${number}`;
-const role = `role${number}`;
-const ingestion_source_name = `ingestion source ${number}`;
-
 describe("managing secrets for ingestion creation", () => {
+  beforeEach(() => {
+    cy.setIsThemeV2Enabled(false);
+  });
   it("create a secret, create ingestion source using a secret, remove a secret", () => {
+    const number = crypto.getRandomValues(new Uint32Array(1))[0];
+    const accound_id = `account${number}`;
+    const warehouse_id = `warehouse${number}`;
+    const username = `user${number}`;
+    const role = `role${number}`;
+    const ingestion_source_name = `ingestion source ${number}`;
+
     // Navigate to the manage ingestion page → secrets
     cy.loginWithCredentials();
     cy.goToIngestionPage();
@@ -44,7 +46,7 @@ describe("managing secrets for ingestion creation", () => {
     cy.get("button").contains("Next").click();
     cy.waitTextVisible("Give this data source a name");
     cy.get('[data-testid="source-name-input"]').type(ingestion_source_name);
-    cy.get("button").contains("Save").click();
+    cy.clickOptionWithTestId("ingestion-source-save-button");
     cy.waitTextVisible("Successfully created ingestion source!").wait(5000);
     cy.waitTextVisible(ingestion_source_name);
     cy.get("button").contains("Pending...").should("be.visible");
diff --git a/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
index 3a74f9b0fc..86b605dc0b 100644
--- a/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
+++ b/smoke-test/tests/cypress/cypress/e2e/mutationsV2/v2_managing_secrets.js
@@ -1,16 +1,15 @@
-const number = Math.floor(Math.random() * 100000);
-const accound_id = `account${number}`;
-const warehouse_id = `warehouse${number}`;
-const username = `user${number}`;
-const password = `password${number}`;
-const role = `role${number}`;
-const ingestion_source_name = `ingestion source ${number}`;
-
 describe("managing secrets for ingestion creation", () => {
   beforeEach(() => {
     cy.setIsThemeV2Enabled(true);
   });
   it("create a secret, create ingestion source using a secret, remove a secret", () => {
+    const number = Math.floor(Math.random() * 100000);
+    const accound_id = `account${number}`;
+    const warehouse_id = `warehouse${number}`;
+    const username = `user${number}`;
+    const role = `role${number}`;
+    const ingestion_source_name = `ingestion source ${number}`;
+
     // Navigate to the manage ingestion page → secrets
     cy.loginWithCredentials();
     cy.skipIntroducePage();
@@ -50,7 +49,7 @@ describe("managing secrets for ingestion creation", () => {
     cy.get("button").contains("Next").click();
     cy.get(".ant-collapse-item").should("be.visible");
     cy.get('[data-testid="source-name-input"]').type(ingestion_source_name);
-    cy.get("button").contains("Save").click();
+    cy.clickOptionWithTestId("ingestion-source-save-button");
     cy.waitTextVisible("Successfully created ingestion source!").wait(5000);
     cy.waitTextVisible(ingestion_source_name);
     cy.get("button").contains("Pending...").should("be.visible");