diff --git a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
index ee38bd445..cb61af64f 100644
--- a/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
+++ b/tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
@@ -84,19 +84,11 @@ describe('Upgrade tests', () => {
             .click();
           cy.getBySel('os-version-box')
             .click()
-          // TODO: remove hardcoded staging version
-          if (upgradeOsChannel == "staging") {
-            cy.getBySel('os-version-box')
-              .parents()
-              .contains('v1.2.1')
-              .click();
-          } else {
-            cy.getBySel('os-version-box')
-              .parents()
-              .contains('latest-'+upgradeOsChannel)
-              .click();
-          }
-        }
+          cy.getBySel('os-version-box')
+            .parents()
+            .contains('latest')
+            .click();
+        } 
 
         cy.getBySel('form-save')
         .contains('Create')
diff --git a/tests/cypress/latest/support/commands.ts b/tests/cypress/latest/support/commands.ts
index f63a31725..3ca60e35f 100644
--- a/tests/cypress/latest/support/commands.ts
+++ b/tests/cypress/latest/support/commands.ts
@@ -115,7 +115,7 @@ Cypress.Commands.add('createMachReg', (
         cy.contains('Elemental Teal ISO x86_64 v1.1.5')
           .click();
       } else if (utils.isOperatorVersion('staging')) {
-        cy.contains('Elemental Teal ISO x86_64 latest-staging')
+        cy.contains('Elemental Teal ISO x86_64 (latest)')
             .click();
       } else {
         cy.contains('Elemental Teal ISO x86_64 latest-dev')