diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
index ef8b02385b97..9de8b3ef1688 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplicationInDeployedMode_spec.ts
@@ -20,7 +20,7 @@ describe(
       cy.url().then((url) => {
         const forkableAppUrl = url;
         cy.LogOut();
-        cy.LogintoApp(
+        cy.LoginFromAPI(
           Cypress.env("TESTUSERNAME1"),
           Cypress.env("TESTPASSWORD1"),
         );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
index 7671fbea3975..34c7740178b3 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Fork/ForkApplication_spec.ts
@@ -29,7 +29,7 @@ describe(
   { tags: ["@tag.Fork"] },
   function () {
     it("1. Mark application as forkable", () => {
-      homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) adminSettings.EnableGAC(false, true);
 
       homePage.CreateNewApplication();
@@ -50,7 +50,7 @@ describe(
       cy.url().then((url) => {
         forkableAppUrl = url;
         cy.LogOut();
-        homePage.LogintoApp(
+        cy.LoginFromAPI(
           Cypress.env("TESTUSERNAME1"),
           Cypress.env("TESTPASSWORD1"),
         );
@@ -60,7 +60,7 @@ describe(
     });
 
     it("2. Check if the forked application has the same dsl as the original", function () {
-      homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       const workspaceName = fakerHelper.GetRandomNumber() + "workspace";
 
       homePage.CreateNewWorkspace(workspaceName);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
index 8e529c5c20af..277e1e97a638 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/ExportApplication_spec.js
@@ -31,7 +31,7 @@ describe(
           );
           cy.LogOut();
 
-          cy.LogintoApp(
+          cy.LoginFromAPI(
             Cypress.env("TESTUSERNAME1"),
             Cypress.env("TESTPASSWORD1"),
           );
@@ -52,7 +52,7 @@ describe(
     });
 
     it("2. User with developer access,should not be able to export the app", function () {
-      cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) adminSettings.EnableGAC(false, true);
       agHelper.GenerateUUID();
       cy.get("@guid").then((uid) => {
@@ -68,7 +68,7 @@ describe(
 
         cy.LogOut();
 
-        cy.LogintoApp(
+        cy.LoginFromAPI(
           Cypress.env("TESTUSERNAME1"),
           Cypress.env("TESTPASSWORD1"),
         );
@@ -90,7 +90,7 @@ describe(
     });
 
     it("3. User with viewer access,should not be able to export the app", function () {
-      homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) adminSettings.EnableGAC(false, true);
       agHelper.GenerateUUID();
       cy.get("@guid").then((uid) => {
@@ -106,7 +106,7 @@ describe(
         );
         cy.LogOut();
 
-        cy.LogintoApp(
+        cy.LoginFromAPI(
           Cypress.env("TESTUSERNAME1"),
           Cypress.env("TESTPASSWORD1"),
         );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ProductRamps/PrivateEmbedRamp_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ProductRamps/PrivateEmbedRamp_spec.ts
index bd8e9453ffe6..0f339abc883f 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/ProductRamps/PrivateEmbedRamp_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/ProductRamps/PrivateEmbedRamp_spec.ts
@@ -93,7 +93,7 @@ describe("Private embed in-app ramp", { tags: ["@tag.Settings"] }, () => {
       );
       _.inviteModal.CloseModal();
       _.homePage.Signout(false);
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
       );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
index 237f90414524..ba1a8ebf24e9 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteWorkspace_spec.ts
@@ -40,10 +40,9 @@ describe(
           false,
         );
         homePage.LogOutviaAPI();
-        homePage.LogintoApp(
+        cy.LoginFromAPI(
           Cypress.env("TESTUSERNAME1"),
           Cypress.env("TESTPASSWORD1"),
-          "App Viewer",
         );
         homePage.OpenWorkspaceOptions(newWorkspaceName);
         agHelper.AssertContains(
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
index 60215cc1c428..dfa129f097ed 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/LeaveWorkspaceTest_spec.js
@@ -40,10 +40,9 @@ describe(
       );
       homePage.LogOutviaAPI();
 
-      homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
-        "App Viewer",
       );
       agHelper.AssertContains(newWorkspaceName);
       homePage.SelectWorkspace(newWorkspaceName, false);
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
index 0826ddd947fa..b43881d53c75 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/MemberRoles_Spec.ts
@@ -30,7 +30,7 @@ describe(
     });
 
     it("2. Login as Administrator and search for users using search bar", () => {
-      _.homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) _.adminSettings.EnableGAC(false, true);
       _.homePage.SelectWorkspace(workspaceId);
       _.agHelper.GetNClick(_.homePage._shareWorkspace(workspaceId));
@@ -46,10 +46,9 @@ describe(
     });
 
     it("3. Login as Invited user and validate Viewer role", function () {
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
-        "App Viewer",
       );
       if (CURRENT_REPO === REPO.EE)
         _.adminSettings.EnableGAC(false, true, "home");
@@ -69,7 +68,7 @@ describe(
     });
 
     it("4. Login as Workspace owner and Update the Invited user role to Developer", function () {
-      _.homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) _.adminSettings.EnableGAC(false, true);
       _.homePage.SelectWorkspace(workspaceId);
       _.homePage.UpdateUserRoleInWorkspace(
@@ -81,10 +80,9 @@ describe(
     });
 
     it("5. Login as Invited user and validate Developer role", function () {
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
-        "Developer",
       );
       if (CURRENT_REPO === REPO.EE)
         _.adminSettings.EnableGAC(false, true, "home");
@@ -113,7 +111,7 @@ describe(
     });
 
     it("6. Login as Workspace owner and Update the Invited user role to Administrator", function () {
-      _.homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) _.adminSettings.EnableGAC(false, true);
       _.homePage.SelectWorkspace(workspaceId);
       _.homePage.UpdateUserRoleInWorkspace(
@@ -125,10 +123,9 @@ describe(
     });
 
     it("7. Login as Invited user and validate Administrator role", function () {
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
-        "Administrator",
       );
       if (CURRENT_REPO === REPO.EE)
         _.adminSettings.EnableGAC(false, true, "home");
@@ -167,7 +164,7 @@ describe(
     });
 
     it("8. Login as Workspace owner and verify all 3 users are present", function () {
-      _.homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       if (CURRENT_REPO === REPO.EE) _.adminSettings.EnableGAC(false, true);
       _.homePage.SelectWorkspace(workspaceId);
       _.homePage.UpdateUserRoleInWorkspace(
@@ -189,7 +186,7 @@ describe(
     });
 
     it("9. Login as Developer, Verify leave workspace flow", () => {
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
       );
@@ -199,10 +196,9 @@ describe(
     });
 
     it("10. Login as App Viewer, Verify leave workspace flow", () => {
-      _.homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME2"),
         Cypress.env("TESTPASSWORD2"),
-        "App Viewer",
       );
       if (CURRENT_REPO === REPO.EE)
         _.adminSettings.EnableGAC(false, true, "home");
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
index 13d613d30591..9dbc5a43a009 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Workspace/ShareAppTests_Spec.ts
@@ -37,10 +37,9 @@ describe(
     });
 
     it("2. login as Invited user and then validate viewer privilage", function () {
-      homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME1"),
         Cypress.env("TESTPASSWORD1"),
-        "App Viewer",
       );
       if (CURRENT_REPO == REPO.EE) adminSettings.EnableGAC(false, true, "home");
 
@@ -61,7 +60,7 @@ describe(
     });
 
     it("3. Enable public access to Application", function () {
-      homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       homePage.FilterApplication(appid);
       homePage.EditAppFromAppHover();
       agHelper.AssertElementAbsence(locators._loading);
@@ -90,7 +89,7 @@ describe(
     });
 
     it("5. login as uninvited user and then validate public access of Application", function () {
-      homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME2"),
         Cypress.env("TESTPASSWORD2"),
       );
@@ -105,7 +104,7 @@ describe(
     });
 
     it("6. login as Owner and disable public access", function () {
-      homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
+      cy.LoginFromAPI(Cypress.env("USERNAME"), Cypress.env("PASSWORD"));
       homePage.FilterApplication(appid);
       agHelper
         .GetElement(homePage._applicationCard)
@@ -120,7 +119,7 @@ describe(
     });
 
     it("7. login as uninvited user, validate public access disable feature ", function () {
-      homePage.LogintoApp(
+      cy.LoginFromAPI(
         Cypress.env("TESTUSERNAME2"),
         Cypress.env("TESTPASSWORD2"),
       );
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js
index c0078065403a..9730cae88f54 100644
--- a/app/client/cypress/support/commands.js
+++ b/app/client/cypress/support/commands.js
@@ -183,6 +183,7 @@ Cypress.Commands.add("LogintoApp", (uname, pword) => {
 });
 
 Cypress.Commands.add("LoginFromAPI", (uname, pword) => {
+  homePageTS.LogOutviaAPI();
   let baseURL = Cypress.config().baseUrl;
   baseURL = baseURL.endsWith("/") ? baseURL.slice(0, -1) : baseURL;