diff --git a/.github/workflows/cypress-run.yml b/.github/workflows/cypress-run.yml
index 85a91b12d..fa4072662 100644
--- a/.github/workflows/cypress-run.yml
+++ b/.github/workflows/cypress-run.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
-    runs-on: self-hosted-runner
+    runs-on: mainnet-compatible-runner
     timeout-minutes: 120
     steps:
       # Checks if skip cache was requested
diff --git a/apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts b/apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts
index d2bd1c0d6..ac6be028d 100644
--- a/apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts
+++ b/apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts
@@ -24,9 +24,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
 
   beforeEach(() => {
     cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-fee-margin-required').within(() => {
-      cy.get('button').click();
-    });
+    cy.getByTestId('deal-ticket-fee-margin-required').click();
   });
 
   describe('limit order', () => {
@@ -111,6 +109,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
           'Total margin available100.01 tDAI'
         );
       });
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
 
     it('must have current margin allocation', () => {
@@ -120,6 +119,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
           'Current margin allocation'
         );
       });
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
 
     it('should open usage breakdown dialog when clicked on current margin allocation', () => {
@@ -128,6 +128,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
       });
       cy.getByTestId('usage-breakdown').should('exist');
       cy.getByTestId('dialog-close').click();
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
   });
 });
diff --git a/apps/trading-e2e/src/integration/trading-trades.cy.ts b/apps/trading-e2e/src/integration/trading-trades.cy.ts
index 50ad89f99..47518fbca 100644
--- a/apps/trading-e2e/src/integration/trading-trades.cy.ts
+++ b/apps/trading-e2e/src/integration/trading-trades.cy.ts
@@ -86,8 +86,8 @@ describe('trades', { tags: '@smoke' }, () => {
   });
 
   it('copy price to deal ticket form', () => {
-    cy.getByTestId('Order').click();
     // 6005-THIS-007
+    cy.getByTestId('order-type-Limit').click();
     cy.get(colIdPrice).last().should('be.visible').click();
     cy.getByTestId('order-price').should('have.value', '171.16898');
   });
diff --git a/vegacapsule/genesis.tmpl b/vegacapsule/genesis.tmpl
index c4a6e60e8..692bd7efc 100644
--- a/vegacapsule/genesis.tmpl
+++ b/vegacapsule/genesis.tmpl
@@ -195,7 +195,6 @@
 		"market.fee.factors.makerFee": "0.004",
 		"market.liquidity.stakeToCcyVolume": "0.3",
 		"market.liquidity.targetstake.triggering.ratio": "0.7",
-    "market.liquidity.providersFeeCalculationTimeStep": "5s",
 		"network.checkpoint.timeElapsedBetweenCheckpoints": "10s",
 		"reward.asset": "{{.GetVegaContractID "VEGA"}}",
 		"reward.staking.delegation.competitionLevel": "3.1",