diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
index 121184ed2..63c5616ea 100644
--- a/.github/workflows/comment.yml
+++ b/.github/workflows/comment.yml
@@ -6,6 +6,14 @@ on:
     types:
       - completed
 
+permissions:
+  actions: read
+  issues: write
+  checks: read
+  statuses: read
+  pull-requests: write
+
 jobs:
   test:
     uses: bgd-labs/github-workflows/.github/workflows/comment.yml@main
+    secrets: inherit
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 00a4b873b..ec7bc3129 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -12,15 +12,42 @@ on:
 
 jobs:
   test:
-    uses: bgd-labs/github-workflows/.github/workflows/foundry-test.yml@main
-    secrets: inherit
-  test-sol-zksync:
-    uses: bgd-labs/github-workflows/.github/workflows/foundry-test.yml@main
-    secrets: inherit
-    with:
-      mode: "CHANGED"
-      zksync: true
-      ROOT_DIR: "zksync"
-  release:
-    needs: [test]
-    uses: bgd-labs/github-workflows/.github/workflows/release.yml@main
+    name: Foundry build n test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: bgd-labs/action-rpc-env@main
+        with:
+          ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
+
+      # we simply use foundry zk for all jobs in this repo
+      - name: Run Foundry setup
+        uses: bgd-labs/github-workflows/.github/actions/foundry-setup@main
+        with:
+          ZKSYNC: 'true'
+
+      - name: Run Forge tests
+        id: test
+        uses: bgd-labs/github-workflows/.github/actions/foundry-test@main
+        with:
+          mode: 'CHANGED'
+
+      - name: Run ZK tests
+        id: zktest
+        uses: bgd-labs/github-workflows/.github/actions/foundry-test@main
+        with:
+          ZKSYNC: true
+          mode: 'CHANGED'
+
+      - name: Run Forge tests
+        uses: bgd-labs/github-workflows/.github/actions/comment-artifact@main
+
+      # we let failing tests pass so we can log them in the comment, still we want the ci to fail
+      - name: Post test
+        if: ${{ steps.test.outputs.testStatus != 0 || steps.zktest.outputs.testStatus != 0 }}
+        run: |
+          echo "tests failed"
+          exit 1
diff --git a/lib/aave-address-book b/lib/aave-address-book
index d6bdf782d..06045520e 160000
--- a/lib/aave-address-book
+++ b/lib/aave-address-book
@@ -1 +1 @@
-Subproject commit d6bdf782d7a395cf125713205fc610c371c17220
+Subproject commit 06045520e1e73eac08432a34235c48979d1dc590