diff --git a/.github/workflows/cypress-run.yml b/.github/workflows/cypress-run.yml
index 85a91b12d..c69ff6edd 100644
--- a/.github/workflows/cypress-run.yml
+++ b/.github/workflows/cypress-run.yml
@@ -13,13 +13,28 @@ on:
         type: string
 
 jobs:
+  runner-choice:
+    runs-on: ubuntu-latest
+    outputs:
+      runner: ${{ steps.step.outputs.runner }}
+    steps:
+      - name: Check branch
+        id: step
+        run: |
+          if [ ${{ github.base_ref }} == 'main' ]; then
+            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
+          else
+            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
+          fi
+
   e2e:
     strategy:
       fail-fast: false
       matrix:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
-    runs-on: self-hosted-runner
+    needs: runner-choice
+    runs-on: ${{ needs.runner-choice.outputs.runner }}
     timeout-minutes: 120
     steps:
       # Checks if skip cache was requested
diff --git a/.github/workflows/lint-pr.yml b/.github/workflows/lint-pr.yml
index 9c6781f86..344a607ac 100644
--- a/.github/workflows/lint-pr.yml
+++ b/.github/workflows/lint-pr.yml
@@ -14,21 +14,16 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
+          node-version: 16
 
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install dependencies
+        run: |
+          rm package.json 
+          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
 
       - name: Check PR title
         run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
diff --git a/vegacapsule/genesis.tmpl b/vegacapsule/genesis.tmpl
index 183de810d..273b1edec 100644
--- a/vegacapsule/genesis.tmpl
+++ b/vegacapsule/genesis.tmpl
@@ -196,7 +196,7 @@
 		"market.fee.factors.makerFee": "0.004",
 		"market.liquidity.stakeToCcyVolume": "0.3",
 		"market.liquidity.targetstake.triggering.ratio": "0.7",
-    "market.liquidity.providersFeeCalculationTimeStep": "5s",
+		"market.liquidity.providersFeeCalculationTimeStep": "5s",
 		"network.checkpoint.timeElapsedBetweenCheckpoints": "10s",
 		"reward.asset": "{{.GetVegaContractID "VEGA"}}",
 		"reward.staking.delegation.competitionLevel": "3.1",