diff --git a/packages/testsuite/cypress/e2e/update-manager/test-update-custom-patch.cy.ts b/packages/testsuite/cypress/e2e/update-manager/test-update-custom-patch.cy.ts
index e0c7046d2..e2e9c59a5 100644
--- a/packages/testsuite/cypress/e2e/update-manager/test-update-custom-patch.cy.ts
+++ b/packages/testsuite/cypress/e2e/update-manager/test-update-custom-patch.cy.ts
@@ -18,10 +18,11 @@ describe("TESTS: Update Manager => Updates => Custom patches", () => {
 
   it("Update server by custom patch", () => {
     cy.navigateToUpdateManagerPage(managementEndpoint, address);
-    cy.get("#update-manager-update-add-actions").click();
-    cy.get("#update-manager-update-patch").click();
+    cy.get("#update-manager-update-update").click();
+    cy.get("input[type='radio'][name='type'][value='CUSTOM_PATCH']").check();
+    cy.confirmNextInWizard();
     cy.env(["PATCH_ZIP"]).then((env) => {
-      cy.get("input#update-manager-update-patch-form-custom-patch-file-editing").selectFile(
+      cy.get("input#update-manager-properties-form-custom-patch-file-editing").selectFile(
         env["PATCH_ZIP"] as string,
         {
           action: "drag-drop",
@@ -29,13 +30,13 @@ describe("TESTS: Update Manager => Updates => Custom patches", () => {
         },
       );
     });
-    cy.text("update-manager-update-patch-form", "manifest", "org.jboss.qe.eap:one-off-1");
+    cy.text("update-manager-properties-form", "manifest", "org.jboss.qe.eap:one-off-1");
     cy.confirmNextInWizard();
     cy.get("#update-manager-list-updates", { timeout: timeoutTime }).should("be.visible").contains(artifactToBeUpdated);
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Server candidate prepared");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Server candidate prepared", { timeout: timeoutTime });
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Updates applied");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Updates applied", { timeout: timeoutTime });
     cy.confirmFinishInWizard();
     // After the update there should be visible 4 items in history
     cy.get("#update-manager-update > ul > li").should("have.length", 4);
diff --git a/packages/testsuite/cypress/e2e/update-manager/test-update-offline-archive.cy.ts b/packages/testsuite/cypress/e2e/update-manager/test-update-offline-archive.cy.ts
index c62e7af9c..820ce0084 100644
--- a/packages/testsuite/cypress/e2e/update-manager/test-update-offline-archive.cy.ts
+++ b/packages/testsuite/cypress/e2e/update-manager/test-update-offline-archive.cy.ts
@@ -18,10 +18,11 @@ describe("TESTS: Update Manager => Updates => Offline using archive", () => {
 
   it("Ofline update from zip", () => {
     cy.navigateToUpdateManagerPage(managementEndpoint, address);
-    cy.get("#update-manager-update-add-actions").click();
-    cy.get("#update-manager-update-offline").click();
+    cy.get("#update-manager-update-update").click();
+    cy.get("input[type='radio'][name='type'][value='OFFLINE_WITH_REPO']").check();
+    cy.confirmNextInWizard();
     cy.env(["UPDATE_ZIP"]).then((env) => {
-      cy.get("input#upload-file-input").selectFile(env["UPDATE_ZIP"] as string, {
+      cy.get("input#update-manager-properties-form-maven-repo-files-editing").selectFile(env["UPDATE_ZIP"] as string, {
         action: "drag-drop",
         force: true,
       });
@@ -29,9 +30,9 @@ describe("TESTS: Update Manager => Updates => Offline using archive", () => {
     cy.confirmNextInWizard();
     cy.get("#update-manager-list-updates", { timeout: timeoutTime }).should("be.visible").contains(artifactToBeUpdated);
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Server candidate prepared");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Server candidate prepared", { timeout: timeoutTime });
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Updates applied");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Updates applied", { timeout: timeoutTime });
     cy.confirmFinishInWizard();
     // After the update there should be visible 3 items in history
     cy.get("#update-manager-update > ul > li").should("have.length", 3);
diff --git a/packages/testsuite/cypress/e2e/update-manager/test-update-online-and-revert-back.cy.ts b/packages/testsuite/cypress/e2e/update-manager/test-update-online-and-revert-back.cy.ts
index e406383fc..b90991537 100644
--- a/packages/testsuite/cypress/e2e/update-manager/test-update-online-and-revert-back.cy.ts
+++ b/packages/testsuite/cypress/e2e/update-manager/test-update-online-and-revert-back.cy.ts
@@ -18,13 +18,14 @@ describe("TESTS: Update Manager => Updates => Online updates => Revert", () => {
 
   it("Online update", () => {
     cy.navigateToUpdateManagerPage(managementEndpoint, address);
-    cy.get("#update-manager-update-add-actions").click();
-    cy.get("#update-manager-update-online").click();
+    cy.get("#update-manager-update-update").click();
+    cy.get("input[type='radio'][name='type'][value='ONLINE']").check();
+    cy.confirmNextInWizard();
     cy.get("#update-manager-list-updates", { timeout: timeoutTime }).should("be.visible").contains(artifactToBeUpdated);
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Server candidate prepared");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Server candidate prepared", { timeout: timeoutTime });
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Updates applied");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Updates applied", { timeout: timeoutTime });
     cy.confirmFinishInWizard();
     // After the update there should be visible 3 items in history
     cy.get("#update-manager-update > ul > li").should("have.length", 3);
@@ -32,13 +33,13 @@ describe("TESTS: Update Manager => Updates => Online updates => Revert", () => {
 
   it("Revert the update", () => {
     cy.navigateToUpdateManagerPage(managementEndpoint, address);
-    cy.get("#update-manager-update > ul > li").first().click();
-    cy.get("#update-manager-update > ul > li > a.clickable.btn.btn-finder").first().click();
+    cy.get("#update-manager-update > ul > li").eq(1).click();
+    cy.get("#update-manager-update > ul > li").eq(1).find("a.clickable.btn.btn-finder").click();
     cy.get("#update-manager-list-updates", { timeout: timeoutTime }).should("be.visible").contains(artifactToBeUpdated);
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Server candidate prepared");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Server candidate prepared", { timeout: timeoutTime });
     cy.confirmNextInWizard();
-    cy.get("div.blank-slate-pf.wizard-pf-complete", { timeout: timeoutTime }).contains("Updates applied");
+    cy.contains("div.blank-slate-pf.wizard-pf-complete", "Updates applied", { timeout: timeoutTime });
     cy.confirmFinishInWizard();
     // After the update there should be visible 4 items in history
     cy.get("#update-manager-update > ul > li").should("have.length", 4);