diff --git a/cypress/e2e/pages/batches.pages.js b/cypress/e2e/pages/batches.pages.js
index f614fb93ef..3a0a14a809 100644
--- a/cypress/e2e/pages/batches.pages.js
+++ b/cypress/e2e/pages/batches.pages.js
@@ -23,6 +23,7 @@ const tokenAddressInput = 'input[name="tokenAddress"]'
 const listBox = 'ul[role="listbox"]'
 const amountInput = '[name="amount"]'
 const nonceInput = 'input[name="nonce"]'
+const executeOptionsContainer = 'div[role="radiogroup"]'
 
 export function addToBatch(EOA, currentNonce, amount, verify = false) {
   fillTransactionData(EOA, amount)
@@ -49,8 +50,12 @@ function setNonceAndProceed(currentNonce) {
 }
 
 function executeTransaction() {
-  cy.contains(yesExecuteString, { timeout: 4000 }).click()
-  cy.contains(addToBatchBtn).should('not.exist')
+  cy.waitForSelector(() => {
+    return cy.get(executeOptionsContainer).then(() => {
+      cy.contains(yesExecuteString, { timeout: 4000 }).click()
+      cy.contains(addToBatchBtn).should('not.exist')
+    })
+  })
 }
 
 function addToBatchButton() {
diff --git a/cypress/e2e/safe-apps/apps_list.cy.js b/cypress/e2e/safe-apps/apps_list.cy.js
index 24d29ff085..0e9aaea987 100644
--- a/cypress/e2e/safe-apps/apps_list.cy.js
+++ b/cypress/e2e/safe-apps/apps_list.cy.js
@@ -2,8 +2,8 @@ import * as constants from '../../support/constants'
 import * as main from '../pages/main.page'
 import * as safeapps from '../pages/safeapps.pages'
 
-const myCustomAppTitle = /my custom app/i
-const myCustomAppDescrAdded = /my custom app description/i
+const myCustomAppTitle = 'Cypress Test App'
+const myCustomAppDescrAdded = 'Cypress Test App Description'
 
 describe('The Safe Apps list', () => {
   before(() => {
diff --git a/cypress/e2e/safe-apps/browser_permissions.cy.js b/cypress/e2e/safe-apps/browser_permissions.cy.js
index bc6a90dad5..1eb627514e 100644
--- a/cypress/e2e/safe-apps/browser_permissions.cy.js
+++ b/cypress/e2e/safe-apps/browser_permissions.cy.js
@@ -6,7 +6,7 @@ describe('The Browser permissions system', () => {
   describe('When the safe app requires permissions', () => {
     beforeEach(() => {
       cy.fixture('safe-app').then((html) => {
-        cy.intercept('GET', `${constants.appUrlProd}/*`, html)
+        cy.intercept('GET', `${constants.testAppUrl}/*`, html)
         cy.intercept('GET', `*/manifest.json`, {
           name: constants.testAppData.name,
           description: constants.testAppData.descr,
@@ -17,7 +17,7 @@ describe('The Browser permissions system', () => {
     })
 
     it('should show a permissions slide to the user', () => {
-      cy.visitSafeApp(`${constants.appUrlProd}/app`)
+      cy.visitSafeApp(`${constants.testAppUrl}/app`)
       safeapps.verifyCameraCheckBoxExists()
       safeapps.verifyMicrofoneCheckBoxExists()
     })
diff --git a/cypress/e2e/safe-apps/tx_modal.cy.js b/cypress/e2e/safe-apps/tx_modal.cy.js
index 60b6cef78c..a085b44e20 100644
--- a/cypress/e2e/safe-apps/tx_modal.cy.js
+++ b/cypress/e2e/safe-apps/tx_modal.cy.js
@@ -7,7 +7,7 @@ const testAppDescr = 'Cypress Test App Description'
 describe('The transaction modal', () => {
   beforeEach(() => {
     cy.fixture('safe-app').then((html) => {
-      cy.intercept('GET', `${constants.appUrlProd}/*`, html)
+      cy.intercept('GET', `${constants.testAppUrl}/*`, html)
       cy.intercept('GET', `*/manifest.json`, {
         name: testAppName,
         description: testAppDescr,
@@ -18,7 +18,7 @@ describe('The transaction modal', () => {
 
   describe('When sending a transaction from an app', () => {
     it('should show the transaction popup', { defaultCommandTimeout: 12000 }, () => {
-      cy.visitSafeApp(`${constants.appUrlProd}/dummy`)
+      cy.visitSafeApp(`${constants.testAppUrl}/dummy`)
 
       main.acceptCookies()
       cy.findByRole('dialog').within(() => {