diff --git a/cypress/support/functions.ts b/cypress/support/functions.ts
index e3b605baf..9c07ea905 100644
--- a/cypress/support/functions.ts
+++ b/cypress/support/functions.ts
@@ -131,15 +131,17 @@ Cypress.Commands.add('createMachReg', ({machRegName, namespace='fleet-default',
   }
 
   if (checkLabels) {
-    cy.clickButton('Add Label');
-    cy.get('#machine-inventory > .mb-30 > .key-value > .kv-container > .kv-item.key').type('myLabel1');
-    cy.get('#machine-inventory > .mb-30 > .key-value > .kv-container > .kv-item.value').type('myLabelValue1');
+    cy.get('#machine-reg').contains('Machine Registration').click();
+    cy.get('#machine-reg > .mb-30 > .key-value > .footer > .btn').click();
+    cy.get('#machine-reg > .mb-30 > .key-value > .kv-container > .kv-item.key').type('myLabel1');
+    cy.get('#machine-reg > .mb-30 > .key-value > .kv-container > .kv-item.value').type('myLabelValue1');
     }
 
   if (checkAnnotations) {
-    cy.clickButton('Add Annotation')
-    cy.get('#machine-inventory > .mb-10 > .key-value > .kv-container > .kv-item.key').type('myAnnotation1');
-    cy.get('#machine-inventory > .mb-10 > .key-value > .kv-container > .kv-item.value').type('myAnnotationValue1');
+    cy.get('#machine-reg').contains('Machine Registration').click();
+    cy.get('#machine-reg > .mb-10 > .key-value > .footer > .btn').click(); 
+    cy.get('#machine-reg > .mb-10 > .key-value > .kv-container > .kv-item.key').type('myAnnotation1');
+    cy.get('#machine-reg > .mb-10 > .key-value > .kv-container > .kv-item.value').type('myAnnotationValue1');
   }
 
   cy.clickButton("Create");