diff --git a/.github/ci-setup-action/action.yml b/.github/ci-setup-action/action.yml
index 4eba68046b3f..e96dfd29a7c1 100644
--- a/.github/ci-setup-action/action.yml
+++ b/.github/ci-setup-action/action.yml
@@ -64,5 +64,5 @@ runs:
           echo "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" > "/run/${{ inputs.concurrency_key }}.lock"
           echo "/run/${{ inputs.concurrency_key }}.lock acquired."
         post: |
-          rm "/run/${{ inputs.concurrency_key }}.lock"
+          rm "/run/${{ inputs.concurrency_key }}.lock" || true
           echo "/run/${{ inputs.concurrency_key }}.lock removed."
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6a94add2258..6c16a8dafbc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,6 @@ jobs:
         timeout-minutes: 40
         run: earthly ./yarn-project+export-end-to-end
       # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
-      # (Note ARM uses just 2 tests as a smoketest)
       - name: Create list of end-to-end jobs
         id: e2e_list
         run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' |  sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
diff --git a/yarn-project/circuit-types/src/simulation_error.ts b/yarn-project/circuit-types/src/simulation_error.ts
index 69e1b98166f3..aa0ccd1dfa6e 100644
--- a/yarn-project/circuit-types/src/simulation_error.ts
+++ b/yarn-project/circuit-types/src/simulation_error.ts
@@ -72,6 +72,8 @@ export class SimulationError extends Error {
     options?: ErrorOptions,
   ) {
     super(originalMessage, options);
+    const getMessage = () => this.getMessage();
+    const getStack = () => this.getStack();
     Object.defineProperties(this, {
       message: {
         configurable: false,
@@ -82,7 +84,7 @@ export class SimulationError extends Error {
          * @returns The message.
          */
         get() {
-          return this.getMessage();
+          return getMessage();
         },
       },
       stack: {
@@ -93,7 +95,7 @@ export class SimulationError extends Error {
          * @returns The stack.
          */
         get() {
-          return this.getStack();
+          return getStack();
         },
       },
     });
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/contract_class_registration.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/contract_class_registration.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/deploy_method.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/deploy_method.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/deploy_method.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/deploy_test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/deploy_test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/deploy_test.ts
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/legacy.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/legacy.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/legacy.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/private_initialization.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/private_initialization.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/private_initialization.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/regressions.test.ts b/yarn-project/end-to-end/src/flakey_e2e_deploy_contract/regressions.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_deploy_contract/regressions.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_deploy_contract/regressions.test.ts
diff --git a/yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts b/yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts
similarity index 100%
rename from yarn-project/end-to-end/src/e2e_inclusion_proofs_contract.test.ts
rename to yarn-project/end-to-end/src/flakey_e2e_inclusion_proofs_contract.test.ts