diff --git a/cypress-tests/cypress.config.js b/cypress-tests/cypress.config.js
index 4f8d914a2f..5e74123f5f 100644
--- a/cypress-tests/cypress.config.js
+++ b/cypress-tests/cypress.config.js
@@ -13,7 +13,7 @@ module.exports = defineConfig({
   requestTimeout: 10000,
   pageLoadTimeout: 20000,
   responseTimeout: 10000,
-  viewportWidth: 1200,
+  viewportWidth: 1440,
   viewportHeight: 960,
   chromeWebSecurity: false,
   trashAssetsBeforeRuns: true,
diff --git a/cypress-tests/cypress/constants/selectors/exportImport.js b/cypress-tests/cypress/constants/selectors/exportImport.js
index 0313e34d5b..5de0135a1c 100644
--- a/cypress-tests/cypress/constants/selectors/exportImport.js
+++ b/cypress-tests/cypress/constants/selectors/exportImport.js
@@ -10,12 +10,12 @@ export const appVersionSelectors = {
   createNewVersion: '[data-cy="create-new-version-title"]',
   versionNamelabel: '[data-cy="version-name-label"]',
   appVersionMenuField:
-    '[data-cy="app-version-selector"] .custom-version-selector__indicators',
+    '[data-cy="app-version-selector"] .undefined__indicators',
   versionNameInputField: '[data-cy="version-name-input-field"]',
   createVersionFromLabel: '[data-cy="create-version-from-label"]',
   createVersionInputField: '[data-cy="create-version-from-input-field"]',
   createNewVersionButton: '[data-cy="create-new-version-button"]',
-  appVersionContentList: ".custom-version-selector__menu-list",
+  appVersionContentList: ".undefined__menu-list",
 };
 export const exportAppModalSelectors = {
   selectVersionTitle: '[data-cy= "select-a-version-to-export-title"]',
diff --git a/cypress-tests/cypress/e2e/editor/app-version/version.cy.js b/cypress-tests/cypress/e2e/editor/app-version/version.cy.js
index 91ee53f95e..0d48eda0ac 100644
--- a/cypress-tests/cypress/e2e/editor/app-version/version.cy.js
+++ b/cypress-tests/cypress/e2e/editor/app-version/version.cy.js
@@ -75,7 +75,6 @@ describe("App Version Functionality", () => {
 		cy.reload();
 		releasedVersionAndVerify(currentVersion = "v3");
 		editVersionAndVerify(currentVersion = "v3", newVersion = ["v5"], releasedVersionText.cannotUpdateReleasedVersionToastMessage);
-		cy.contains(releasedVersionText.releasedModalText).should("be.visible");
 		closeModal(commonText.closeButton);
 
 		deleteVersionAndVerify(currentVersion = "v3", releasedVersionText.cannotDeleteReleasedVersionToastMessage)
diff --git a/cypress-tests/cypress/e2e/exportImport/import.cy.js b/cypress-tests/cypress/e2e/exportImport/import.cy.js
index cbd5dff1e8..f4c0b688cc 100644
--- a/cypress-tests/cypress/e2e/exportImport/import.cy.js
+++ b/cypress-tests/cypress/e2e/exportImport/import.cy.js
@@ -132,6 +132,7 @@ describe("App Import Functionality", () => {
     cy.reload();
     navigateToAppEditor(data.appReName);
 
+    cy.wait(500);
     cy.get(appVersionSelectors.appVersionMenuField)
       .should("be.visible")
       .click();
diff --git a/cypress-tests/cypress/support/commands.js b/cypress-tests/cypress/support/commands.js
index d6642c7ffd..4ee78384f2 100644
--- a/cypress-tests/cypress/support/commands.js
+++ b/cypress-tests/cypress/support/commands.js
@@ -92,7 +92,7 @@ Cypress.Commands.add("waitForAutoSave", () => {
 Cypress.Commands.add("createApp", (appName) => {
   cy.get("body").then(($title) => {
     if ($title.text().includes(commonText.introductionMessage)) {
-      cy.get(commonSelectors.emptyAppCreateButton).click();
+      cy.get(commonSelectors.emptyAppCreateButton).eq(0).click();
     } else {
       cy.get(commonSelectors.appCreateButton).click();
     }
diff --git a/cypress-tests/cypress/support/utils/common.js b/cypress-tests/cypress/support/utils/common.js
index bec0641e8f..c5f0e6be8e 100644
--- a/cypress-tests/cypress/support/utils/common.js
+++ b/cypress-tests/cypress/support/utils/common.js
@@ -78,7 +78,7 @@ export const navigateToAppEditor = (appName) => {
     .trigger("mousehover")
     .trigger("mouseenter")
     .find(commonSelectors.editButton)
-    .click();
+    .click({force:true});
   //cy.wait("@appEditor");
 };
 
diff --git a/cypress-tests/cypress/support/utils/version.js b/cypress-tests/cypress/support/utils/version.js
index 441b11178d..c0689507c4 100644
--- a/cypress-tests/cypress/support/utils/version.js
+++ b/cypress-tests/cypress/support/utils/version.js
@@ -9,7 +9,8 @@ import { verifyComponent } from "Support/utils/basicComponents";
 
 export const navigateToCreateNewVersionModal = (value) => {
 	cy.get(appVersionSelectors.currentVersionField(value)).should("be.visible").click();
-	cy.contains(appVersionText.createNewVersion).should("be.visible").click();
+	cy.contains(appVersionText.createNewVersion).should("be.visible");
+	cy.contains(appVersionText.createNewVersion).click();
 }
 
 export const navigateToEditVersionModal = (value) => {
@@ -41,6 +42,12 @@ export const verifyElementsOfCreateNewVersionModal = (version = []) => {
 
 export const editVersionAndVerify = (currentVersion, newVersion = [], toastMessageText) => {
 	cy.reload();
+	cy.get(appVersionSelectors.currentVersionField(currentVersion)).then(($ele) => {
+	if ($ele.hasClass("color-light-green")) {
+		cy.contains(releasedVersionText.releasedModalText).should("be.visible");
+		closeModal(commonText.closeButton);
+	}
+	})
 	navigateToEditVersionModal(currentVersion)
 	cy.get(editVersionSelectors.versionNameInputField).verifyVisibleElement("have.value", currentVersion);
 
@@ -49,7 +56,7 @@ export const editVersionAndVerify = (currentVersion, newVersion = [], toastMessa
 		newVersion[0]
 	);
 	cy.get(editVersionSelectors.saveButton).click();
-	closeModal(commonText.closeButton);
+	cy.wait(500);
 	cy.verifyToastMessage(
 		commonSelectors.toastMessage,
 		toastMessageText