diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/CustomProperty.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/CustomProperty.ts
index f52069c75f3c..a08544ed4d98 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/CustomProperty.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/Utils/CustomProperty.ts
@@ -171,7 +171,7 @@ export const setValueForProperty = (
     .scrollIntoView()
     .as('editbutton');
 
-  cy.get('@editbutton').should('be.visible').click();
+  cy.get('@editbutton').should('be.visible').click({ force: true });
 
   interceptURL('PATCH', `/api/v1/*/*`, 'patchEntity');
   // Checking for value text box or markdown box
@@ -257,7 +257,13 @@ export const setValueForProperty = (
       const refValues = value.split(',');
 
       refValues.forEach((val) => {
+        interceptURL(
+          'GET',
+          `/api/v1/search/query?q=*${encodeURIComponent(val)}*`,
+          'searchEntityReference'
+        );
         cy.get('#entityReference').clear().type(`${val}`);
+        cy.wait('@searchEntityReference');
         cy.get(`[data-testid="${val}"]`).click();
       });
 
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/serviceUtils.ts b/openmetadata-ui/src/main/resources/ui/cypress/common/serviceUtils.ts
index 7f4be0cd2568..93edbe4180ac 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/common/serviceUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/common/serviceUtils.ts
@@ -42,8 +42,6 @@ export const visitServiceDetailsPage = (service, verifyHeader = true) => {
         expect(text).to.equal(service.displayName);
       });
   }
-
-  verifyResponseStatusCode('@getServices', 200);
 };
 
 export const createDataWithApi = (data, token) => {
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Customproperties.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Customproperties.spec.ts
index 9343086d66de..fa181bdf4487 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Customproperties.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Customproperties.spec.ts
@@ -279,6 +279,10 @@ describe('Custom Properties should work properly', { tags: 'Settings' }, () => {
     cy.login();
   });
 
+  afterEach(() => {
+    cy.logout();
+  });
+
   [
     'Integer',
     'String',
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Database.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Database.spec.ts
index 2ff7e2951241..8ad55279948c 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Database.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Database.spec.ts
@@ -56,6 +56,7 @@ describe('Database hierarchy details page', { tags: 'DataAssets' }, () => {
         cy.login();
 
         entity.cleanup();
+        cy.logout();
       });
 
       beforeEach(() => {
diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts
index ca9063acd268..d85ac0a33799 100644
--- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Entity.spec.ts
@@ -64,6 +64,7 @@ describe('Entity detail page', { tags: 'DataAssets' }, () => {
         cy.login();
 
         entity.cleanup();
+        cy.logout();
       });
 
       beforeEach(() => {