diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
index 6ddc01acf9a9..4f71e89d4f43 100644
--- a/.github/workflows/ci-arm.yml
+++ b/.github/workflows/ci-arm.yml
@@ -14,7 +14,7 @@ env:
   DOCKERHUB_PASSWORD: "${{ secrets.DOCKERHUB_PASSWORD }}"
   RUN_ID: ${{ github.run_id }}
   RUN_ATTEMPT: ${{ github.run_attempt }}
-  USERNAME: master
+  USERNAME: ${{ github.event.pull_request.user.login || github.actor }}
   GITHUB_TOKEN: ${{ github.token }}
   GH_SELF_HOSTED_RUNNER_TOKEN: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -33,7 +33,11 @@ jobs:
         timeout-minutes: 40
         uses: ./.github/ensure-builder
         with:
+<<<<<<< HEAD
           runner_type: builder-arm
+=======
+          runner_type: builder-x86
+>>>>>>> 237952e9fe (fix: arm ci (#6480))
           run: |
             set -eux
             git submodule update --init --recursive --recommend-shallow
@@ -48,12 +52,20 @@ jobs:
       - uses: actions/checkout@v4
         with: { ref: "${{ github.event.pull_request.head.sha }}" }
       - name: "Test"
+<<<<<<< HEAD
         timeout-minutes: 25
         uses: ./.github/ensure-builder
         with:
           runner_type: builder-arm
           run: |
             sudo shutdown -P 25 # hack until core part of the scripts
+=======
+        timeout-minutes: 15
+        uses: ./.github/ensure-builder
+        with:
+          runner_type: builder-x86
+          run: |
+>>>>>>> 237952e9fe (fix: arm ci (#6480))
             set -eux
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
             scripts/earthly-ci -P --no-output ./yarn-project/end-to-end/+uniswap-trade-on-l1-from-l2