diff --git a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js
index 4f32b7bdc..0728c47f7 100644
--- a/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js
+++ b/cypress/e2e/edge-application/rules-engine/create-rule-engine-set-function.cy.js
@@ -32,12 +32,12 @@ const createFunctionCase = () => {
   // Act
   cy.get(selectors.functions.nameInput).clear()
   cy.get(selectors.functions.nameInput).type(fixtures.functionName, { delay: 0 })
-  cy.intercept('GET', 'api/v3/edge_functions*').as('getEdgeFunctions')
+  cy.intercept('GET', 'api/v4/edge_functions/functions/*').as('getFunctions2')
   cy.get(selectors.edgeApplication.functionsInstance.edgeFunctionActionbar)
     .find(selectors.functions.saveButton)
     .click()
   cy.verifyToast('success', 'Your edge function has been created')
-  cy.wait('@getEdgeFunctions')
+  cy.wait('@getFunctions2')
 }
 
 describe('Edge Application', { tags: ['@dev3'] }, () => {
@@ -76,11 +76,13 @@ describe('Edge Application', { tags: ['@dev3'] }, () => {
     cy.get(selectors.edgeApplication.rulesEngine.behaviorsDropdown(0)).click()
     cy.get(selectors.edgeApplication.rulesEngine.behaviorsOption('Run Function')).click()
     cy.get(selectors.edgeApplication.rulesEngine.setFunctionInstanceSelect(0)).click()
+    cy.intercept('GET', 'api/v4/edge_functions/functions*').as('getFunctions')
     cy.get(selectors.edgeApplication.rulesEngine.createFunctionInstanceButton).click()
     cy.get(selectors.edgeApplication.functionsInstance.nameInput).clear()
     cy.get(selectors.edgeApplication.functionsInstance.nameInput).type(
       fixtures.functionInstanceName
     )
+    cy.wait('@getFunctions')
     cy.get(selectors.edgeApplication.functionsInstance.edgeFunctionsDropdown).click()
     cy.get(selectors.edgeApplication.functionsInstance.createFunctionButton).click()
     createFunctionCase()
@@ -103,7 +105,7 @@ describe('Edge Application', { tags: ['@dev3'] }, () => {
       .click()
 
     cy.get(selectors.form.actionsSubmitButton).click()
-    cy.verifyToast('success', 'Your Rules Engine has been created.')
+    cy.verifyToast('success', 'Rule successfully created')
 
     // Assert
     cy.get(selectors.list.searchInput).type(`${fixtures.rulesEngineName}{enter}`)
diff --git a/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js b/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js
index b519ebdc6..84b5d978f 100644
--- a/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js
+++ b/cypress/e2e/edge-firewall/create-edge-firewall-function.cy.js
@@ -13,8 +13,8 @@ const createFunctionCase = () => {
   cy.verifyToast('success', 'Your edge function has been created')
   cy.wait('@getFunctionsSaved')
 }
-
-describe('Edge Firewall spec', { tags: ['@dev5'] }, () => {
+//Flag xfail until the api contract is updated on prod
+describe('Edge Firewall spec', { tags: ['@dev5, @xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     firewallName = generateUniqueName('EdgeFirewall')
diff --git a/cypress/e2e/edge-firewall/create-edge-firewall-rule-engine-header-criteria.cy.js b/cypress/e2e/edge-firewall/create-edge-firewall-rule-engine-header-criteria.cy.js
index 72daeb043..942457419 100644
--- a/cypress/e2e/edge-firewall/create-edge-firewall-rule-engine-header-criteria.cy.js
+++ b/cypress/e2e/edge-firewall/create-edge-firewall-rule-engine-header-criteria.cy.js
@@ -4,7 +4,8 @@ import selectors from '../../support/selectors'
 
 let firewallName, ruleName
 
-describe('Edge Firewall spec', { tags: ['@dev5'] }, () => {
+//Flag xfail until the api contract is updated on prod
+describe('Edge Firewall spec', { tags: ['@dev5, @xfail'] }, () => {
   beforeEach(() => {
     cy.login()
     firewallName = generateUniqueName('EdgeFirewall')
diff --git a/cypress/e2mock/teams-permissions.cy.js b/cypress/e2mock/teams-permissions.cy.js
index d02b85308..24d033017 100644
--- a/cypress/e2mock/teams-permissions.cy.js
+++ b/cypress/e2mock/teams-permissions.cy.js
@@ -13,7 +13,7 @@ describe('Teams Permissions Spec', { tags: ['@dev2'] }, () => {
 
   it('should block users without access of entering in the edit page', function () {
     //act
-    cy.get(selectors.list.searchField).type('Default Team')
+    cy.get(selectors.list.searchField).type('Default Team {enter}')
     cy.intercept('GET', '/api/v4/iam/teams/*', { statusCode: 403, body: fixtures.errorMessage }).as(
       'teamsPermissions'
     )