diff --git a/.github/workflows/pr-main_l1.yaml b/.github/workflows/pr-main_l1.yaml
index 966593a771..1a510db676 100644
--- a/.github/workflows/pr-main_l1.yaml
+++ b/.github/workflows/pr-main_l1.yaml
@@ -8,9 +8,9 @@ on:
     paths-ignore:
       - "crates/l2/**" # Behind a feature flag not used in this workflow
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
+# concurrency:
+#   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+#   cancel-in-progress: false
 
 jobs:
   lint:
@@ -80,12 +80,12 @@ jobs:
     name: "Setup Hive"
     runs-on: ubuntu-latest
     env:
-      HIVE_COMMIT_HASH: 8e8c83f5c5a06561407a6a7848f5a4b32a10a467 # commit from our fork
+      HIVE_COMMIT_HASH: 276ca9deaee8e5831b11fa6e884a9479ee8ca140
     steps:
       - uses: actions/checkout@v4
       - name: Setup Hive
         run: |
-          git clone --single-branch --branch master https://github.com/lambdaclass/hive
+          git clone --single-branch --branch master https://github.com/ethereum/hive
           cd hive
           git checkout --detach ${{ env.HIVE_COMMIT_HASH }}
           go build .
@@ -99,8 +99,9 @@ jobs:
     name: Assertoor - ${{ matrix.name }}
     runs-on: ubuntu-latest
     needs: [docker_build]
-    if: ${{ github.event_name != 'merge_group' }}
+    if: ${{ always() && github.event_name != 'merge_group' }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: Transaction Check
@@ -139,8 +140,9 @@ jobs:
     name: Hive - ${{ matrix.name }}
     runs-on: ubuntu-latest
     needs: [docker_build, setup-hive]
-    if: ${{ github.event_name != 'merge_group' }}
+    if: ${{ always() && github.event_name != 'merge_group' }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: "Rpc Compat tests"
diff --git a/Makefile b/Makefile
index 860180ebb4..dba317552f 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ setup-hive: ## 🐝 Set up Hive testing framework
 		git pull origin $(HIVE_BRANCH) && \
 		go build .; \
 	else \
-		git clone --branch $(HIVE_BRANCH) https://github.com/lambdaclass/hive && \
+		git clone --branch $(HIVE_BRANCH) https://github.com/ethereum/hive && \
 		cd hive && \
 		git checkout $(HIVE_BRANCH) && \
 		go build .; \