diff --git a/.github/scripts/levm_revm_diff.sh b/.github/scripts/hive_levm_revm_diff.sh
similarity index 100%
rename from .github/scripts/levm_revm_diff.sh
rename to .github/scripts/hive_levm_revm_diff.sh
diff --git a/.github/scripts/publish_hive.sh b/.github/scripts/publish_hive.sh
index 8b66671d6f..8db39565c5 100644
--- a/.github/scripts/publish_hive.sh
+++ b/.github/scripts/publish_hive.sh
@@ -1,7 +1,7 @@
 curl -X POST $1 \
 -H 'Content-Type: application/json; charset=utf-8' \
 --data @- <<EOF
-$(jq -n --arg text "$(cat results.md)" '{
+$(jq -n --arg text "$(cat results_revm.md)" '{
     "blocks": [
         {
             "type": "header",
diff --git a/.github/scripts/publish_levm_hive.sh b/.github/scripts/publish_levm_hive.sh
index 333988fffe..c26d63d1c4 100644
--- a/.github/scripts/publish_levm_hive.sh
+++ b/.github/scripts/publish_levm_hive.sh
@@ -1,7 +1,7 @@
 curl -X POST $1 \
 -H 'Content-Type: application/json; charset=utf-8' \
 --data @- <<EOF
-$(jq -n --arg text "$(cat results.md)" '{
+$(jq -n --arg text "$(cat results_levm.md)" '{
     "blocks": [
         {
             "type": "header",
diff --git a/.github/workflows/ci_bench_levm_in_pr.yaml b/.github/workflows/ci_bench_levm_in_pr.yaml
index 5579afa8b5..3ed98e6187 100644
--- a/.github/workflows/ci_bench_levm_in_pr.yaml
+++ b/.github/workflows/ci_bench_levm_in_pr.yaml
@@ -2,7 +2,7 @@ name: Benchmark LEVM vs REVM in PR
 
 on:
   pull_request:
-    branches: [ "**" ]
+    branches: ["**"]
     paths:
       - "crates/vm/levm/**"
 
@@ -114,7 +114,7 @@ jobs:
   combine-results:
     name: Combine Benchmark Results
     runs-on: ubuntu-latest
-    needs: [ benchmark-pr, benchmark-main ]
+    needs: [benchmark-pr, benchmark-main]
     steps:
       - name: Download PR results
         uses: actions/download-artifact@v4
@@ -184,6 +184,8 @@ jobs:
           cd crates/vm/levm && awk '/Summary: /,/Frontier/' test_result.txt;
 
       - name: Check EF-TESTS status is 100%
+        id: check_tests
+        continue-on-error: true
         run: |
           cd crates/vm/levm
           if [ "$(awk '/Summary:/ {print $(NF)}' test_result.txt)" != "(100.00%)" ]; then
@@ -210,8 +212,10 @@ jobs:
           comment-author: "github-actions[bot]"
           body-includes: "Summary:"
 
+      # If we have a failure, means that some ef-tests don't pass.
+      # If the condition is met, create or update the comment with the summary.
       - name: Create Comment
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ steps.check_tests.outcome == 'failure' && github.event_name == 'pull_request' }}
         uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
@@ -219,3 +223,17 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-path: test_summary.txt
           edit-mode: replace
+
+      # If we don't have a failure, means that all ef-tests pass.
+      # If comment-id != '', means that we've already created the comment.
+      # If both conditions are met, update the comment saying that all tests pass.
+      - name: Update Comment -- ALL
+        if: ${{ steps.check_tests.outcome != 'failure' && github.event_name == 'pull_request' && steps.fc.outputs.comment-id != '' }}
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Summary: All EF-TESTS pass.
+          edit-mode: replace
diff --git a/.github/workflows/ci_levm.yaml b/.github/workflows/ci_levm.yaml
index 75ae87a9b5..46f76313e8 100644
--- a/.github/workflows/ci_levm.yaml
+++ b/.github/workflows/ci_levm.yaml
@@ -2,9 +2,9 @@ name: LEVM
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "**" ]
+    branches: ["**"]
     paths:
       - "crates/vm/levm/**"
 
@@ -18,8 +18,8 @@ env:
 
 jobs:
   ef-test:
-    # "Integration Test" is a required check, don't change the name
-    name: Integration Test
+    if: ${{ github.event_name != 'merge_group' }}
+    name: EF Tests Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
@@ -58,6 +58,78 @@ jobs:
               echo "Percentage is not 100%."
               exit 1
           fi
+
+  hive-report-creation:
+    uses: ./.github/workflows/common_hive_reports.yaml
+    with:
+      evm: levm
+      job_type: trigger
+
+  # Check we don't have a regression against main
+  hive-test:
+    if: ${{ github.event_name != 'merge_group' }}
+    name: Hive Tests Check
+    needs: hive-report-creation
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Download results (pr)
+        uses: actions/download-artifact@v4
+        with:
+          name: results_levm_trigger.md
+
+      - name: Rename result (1)
+        run: cp results.md results_levm.md
+
+      - name: Download results (main)
+        uses: actions/download-artifact@v4
+        with:
+          name: results_levm_daily.md
+        # If we don't have the file it will use the result(1) file
+        continue-on-error: true
+
+      - name: Rename result (2)
+        run: cp results.md results_levm_daily.md
+
+      - name: Create diff message
+        run: |
+          bash .github/scripts/hive_levm_revm_diff.sh results_levm_daily.md results_levm.md >> diff.md
+          cat diff.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Check Regression
+        run: |
+          if grep -q "No differences found" diff.md; then
+            echo "No differences found."
+          elif ! grep -q "regression" diff.md; then
+            echo "No regression found."
+          else
+            echo "Differences found."
+            exit 1
+          fi
+
+  # The purpose of this job is to add it as a required check in GitHub so that we don't have to add every individual job as a required check
+  all-tests:
+    # "Integration Test" is a required check, don't change the name
+    name: Integration Test
+    runs-on: ubuntu-latest
+    needs: [hive-test, ef-test]
+    # Make sure this job runs even if the previous jobs failed or were skipped
+    if: ${{ always() && needs.hive-test.result != 'skipped' && needs.ef-test.result != 'skipped' }}
+    steps:
+      - name: Check if any job failed
+        run: |
+          if [ "${{ needs.hive-test.result }}" != "success" ]; then
+            echo "Job Hive Tests Check failed"
+            exit 1
+          fi
+
+          if [ "${{ needs.ef-test.result }}" != "success" ]; then
+            echo "Job EF Tests Check failed"
+            exit 1
+          fi
+
   test:
     # "Test" is a required check, don't change the name
     name: Test
diff --git a/.github/workflows/common_hive_reports.yaml b/.github/workflows/common_hive_reports.yaml
new file mode 100644
index 0000000000..fc789402cc
--- /dev/null
+++ b/.github/workflows/common_hive_reports.yaml
@@ -0,0 +1,107 @@
+name: Run Hive Tests
+
+on:
+  workflow_call:
+    inputs:
+      # Must be 'levm' or 'revm'
+      evm:
+        required: true
+        type: string
+      # Must be 'daily' or 'trigger'
+      # If it's daily, it is assumed that the CI is checking out the main branch
+      job_type:
+        required: true
+        type: string
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_VERSION: 1.81.0
+
+jobs:
+  run-hive:
+    name: Hive (${{ inputs.evm }}) - ${{ matrix.test.name }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test:
+          - {
+              name: "Rpc Compat tests",
+              file_name: rpc-compat,
+              simulation: ethereum/rpc-compat,
+            }
+          - { name: "Devp2p eth tests", file_name: devp2p, simulation: devp2p }
+          - {
+              name: "Cancun Engine tests",
+              file_name: engine,
+              simulation: ethereum/engine,
+            }
+          - { name: "Sync tests", file_name: sync, simulation: ethereum/sync }
+
+    steps:
+      - name: Pull image
+        if: ${{ inputs.evm == 'revm' }}
+        run: |
+          docker pull ghcr.io/lambdaclass/ethrex:latest
+          docker tag ghcr.io/lambdaclass/ethrex:latest ethrex:latest
+
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Build Image with LEVM
+        if: ${{ inputs.evm == 'levm' }}
+        run: cd crates/vm/levm && make build-image-levm
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+
+      - name: Setup Hive
+        run: make setup-hive
+
+      - name: Run Hive Simulation
+        run: cd hive && ./hive --client ethrex --sim ${{ matrix.test.simulation }} --sim.parallelism 16
+        continue-on-error: true
+
+      - name: Upload results
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.test.file_name }}_${{ inputs.evm }}_${{ inputs.job_type }}_logs
+          path: hive/workspace/logs/*-*.json
+          if-no-files-found: error
+
+  hive-report:
+    name: Generate and Save report (${{ inputs.evm }})
+    needs: run-hive
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Rustup toolchain install
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+
+      - name: Download all results
+        uses: actions/download-artifact@v4
+        with:
+          path: hive/workspace/logs
+          pattern: "*_${{ inputs.evm }}_${{ inputs.job_type }}_logs"
+          merge-multiple: true
+
+      - name: Caching
+        uses: Swatinem/rust-cache@v2
+
+      - name: Generate the hive report
+        run: cargo run -p hive_report > results.md
+
+      - name: Upload ${{inputs.evm}}_${{ inputs.job_type }} result
+        uses: actions/upload-artifact@v4
+        with:
+          name: results_${{inputs.evm}}_${{ inputs.job_type }}.md
+          path: results.md
+          if-no-files-found: error
+
+      - name: Post results in summary
+        run: |
+          echo "# Hive coverage report (${{ inputs.evm }})" >> $GITHUB_STEP_SUMMARY
+          cat results.md >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/daily_reports.yaml b/.github/workflows/daily_reports.yaml
index 7b5640dff1..a01eb690fb 100644
--- a/.github/workflows/daily_reports.yaml
+++ b/.github/workflows/daily_reports.yaml
@@ -10,97 +10,45 @@ env:
   RUST_VERSION: 1.81.0
 
 jobs:
-  run-hive:
-    name: Hive (${{ matrix.vm }}) - ${{ matrix.test.name }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        vm: [levm, revm]
-        test:
-          - {
-              name: "Rpc Compat tests",
-              file_name: rpc-compat,
-              simulation: ethereum/rpc-compat,
-            }
-          - { name: "Devp2p eth tests", file_name: devp2p, simulation: devp2p }
-          - {
-              name: "Cancun Engine tests",
-              file_name: engine,
-              simulation: ethereum/engine,
-            }
-          - { name: "Sync tests", file_name: sync, simulation: ethereum/sync }
-
-    steps:
-      - name: Pull image
-        if: ${{ matrix.vm == 'revm' }}
-        run: |
-          docker pull ghcr.io/lambdaclass/ethrex:latest
-          docker tag ghcr.io/lambdaclass/ethrex:latest ethrex:latest
-
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Build Image with LEVM
-        if: ${{ matrix.vm == 'levm' }}
-        run: cd crates/vm/levm && make build-image-levm
+  hive-report-creation-levm:
+    uses: ./.github/workflows/common_hive_reports.yaml
+    with:
+      evm: levm
+      job_type: daily
+  hive-report-creation-revm:
+    uses: ./.github/workflows/common_hive_reports.yaml
+    with:
+      evm: revm
+      job_type: daily
 
-      - name: Setup Go
-        uses: actions/setup-go@v5
-
-      - name: Setup Hive
-        run: make setup-hive
-
-      - name: Run Hive Simulation
-        run: cd hive && ./hive --client ethrex --sim ${{ matrix.test.simulation }} --sim.parallelism 16
-        continue-on-error: true
-
-      - name: Upload results
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.test.file_name }}_${{ matrix.vm }}_logs
-          path: hive/workspace/logs/*-*.json
-          if-no-files-found: error
-
-  hive-report:
-    name: Generate report and upload to Slack (${{ matrix.vm }})
-    needs: run-hive
+  hive-diff-report:
+    name: Post tests diff to levm slack
+    needs: [hive-report-creation-levm, hive-report-creation-revm]
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        vm: [levm, revm]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Rustup toolchain install
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-
-      - name: Download all results
+      - name: Download results (levm)
         uses: actions/download-artifact@v4
         with:
-          path: hive/workspace/logs
-          pattern: "*_${{ matrix.vm }}_logs"
-          merge-multiple: true
+          name: results_levm_daily_main.md
 
-      - name: Caching
-        uses: Swatinem/rust-cache@v2
-
-      - name: Generate the hive report
-        run: cargo run -p hive_report > results.md
+      - name: Rename result (1)
+        run: cp results.md results_levm.md
 
-      - name: Upload ${{matrix.vm}} result
-        uses: actions/upload-artifact@v4
+      - name: Download results (revm)
+        uses: actions/download-artifact@v4
         with:
-          name: results_${{matrix.vm}}.md
-          path: results.md
-          if-no-files-found: error
+          name: results_revm_daily_main.md
 
-      - name: Post results in summary
+      - name: Rename result (2)
+        run: cp results.md results_revm.md
+
+      - name: Create diff message
         run: |
-          echo "# Hive coverage report (${{ matrix.vm }})" >> $GITHUB_STEP_SUMMARY
-          cat results.md >> $GITHUB_STEP_SUMMARY
+          bash .github/scripts/hive_levm_revm_diff.sh results_revm.md results_levm.md >> diff.md
+          cat diff.md >> $GITHUB_STEP_SUMMARY
 
       - name: Post results to Slack
         env:
@@ -114,39 +62,12 @@ jobs:
                   secrets.LEVM_SLACK_WEBHOOK
                 )
             }}
-          SCRIPT: >
-            ${{ matrix.vm == 'levm'
-              && '.github/scripts/publish_levm_hive.sh'
-              || '.github/scripts/publish_hive.sh'
-            }}
         run: |
           for webhook in $SLACK_WEBHOOKS; do
-            sh $SCRIPT "$webhook"
+            sh .github/scripts/publish_levm_hive.sh "$webhook"
+            sh .github/scripts/publish_hive.sh "$webhook"
           done
-
-  hive-diff-report:
-    name: Post tests diff to levm slack
-    needs: hive-report
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Download results (levm)
-        uses: actions/download-artifact@v4
-        with:
-          name: results_levm.md
-
-      - name: Rename result (1)
-        run: cp results.md results_levm.md
-
-      - name: Download results (revm)
-        uses: actions/download-artifact@v4
-        with:
-          name: results_revm.md
-
-      - name: Rename result (2)
-        run: cp results.md results_revm.md
+          echo "Sending Results" >> $GITHUB_STEP_SUMMARY
 
       - name: Post results diff to Slack
         env:
@@ -155,10 +76,14 @@ jobs:
               && secrets.TEST_CHANNEL_SLACK
               || secrets.LEVM_SLACK_WEBHOOK
             }}
+        # Only send diff message if the diff has changed
         run: |
-          bash .github/scripts/levm_revm_diff.sh results_revm.md results_levm.md >> diff.md
-          cat diff.md >> $GITHUB_STEP_SUMMARY
-          sh .github/scripts/publish_vms_diff.sh $SLACK_WEBHOOK
+          if grep -q "No differences found" diff.md; then
+            echo "No differences to post" >> $GITHUB_STEP_SUMMARY
+          else
+            sh .github/scripts/publish_vms_diff.sh $SLACK_WEBHOOK
+            echo "Sending Results" >> $GITHUB_STEP_SUMMARY
+          fi
 
   levm-test:
     name: Generate Report for LEVM EF Tests
@@ -190,7 +115,18 @@ jobs:
           echo "# Daily LEVM EF Tests Run Report" >> $GITHUB_STEP_SUMMARY
           cat cmd/ef_tests/levm/levm_ef_tests_summary_github.txt >> $GITHUB_STEP_SUMMARY
 
+      - name: Check EF-TESTS status is 100%
+        id: check_tests
+        continue-on-error: true
+        run: |
+          cd crates/vm/levm
+          if [ "$(awk '/**Summary**:/ {print $(NF)}' cmd/ef_tests/levm/levm_ef_tests_summary_github.txt)" != "(100.00%)" ]; then
+              echo "Percentage is not 100%."
+              exit 1
+          fi
+
       - name: Post results to Slack
+        if: ${{steps.check_tests.outcome == 'failure'}}
         env:
           SLACK_WEBHOOK: >
             ${{ github.event_name == 'workflow_dispatch'
diff --git a/crates/vm/levm/src/vm.rs b/crates/vm/levm/src/vm.rs
index 85083c16f0..82f74fbf85 100644
--- a/crates/vm/levm/src/vm.rs
+++ b/crates/vm/levm/src/vm.rs
@@ -949,6 +949,7 @@ impl VM {
                 }
             };
 
+            // TESTING LEVM CI
             auth_account.info.bytecode = if auth_tuple.address != Address::zero() {
                 delegation_bytes.into()
             } else {