diff --git a/.gitmodules b/.gitmodules
index 837cb4ae2..bb031f752 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,4 @@
 [submodule "lib/aave-address-book"]
 	path = lib/aave-address-book
 	url = https://github.com/bgd-labs/aave-address-book
+	branch = feat/ZkSync
diff --git a/lib/aave-address-book b/lib/aave-address-book
index 63edff27c..23fb03113 160000
--- a/lib/aave-address-book
+++ b/lib/aave-address-book
@@ -1 +1 @@
-Subproject commit 63edff27c017c3b5f10e02055d6959aba0d2275e
+Subproject commit 23fb03113179ca942ed4f5a5f91faf7120007505
diff --git a/lib/forge-std b/lib/forge-std
index c28115db8..2cbff0602 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit c28115db8d90ebffb41953cf83aac63130f4bd40
+Subproject commit 2cbff0602d340503dba9828ab6981053704d1384
diff --git a/lib/solidity-utils b/lib/solidity-utils
index 17a826c5c..9e1215692 160000
--- a/lib/solidity-utils
+++ b/lib/solidity-utils
@@ -1 +1 @@
-Subproject commit 17a826c5c7e691f8938043ea72b4040def416015
+Subproject commit 9e1215692ff2db31197b281a1083c52f928a0217
diff --git a/src/adi/test/ADITestBase.sol b/src/adi/test/ADITestBase.sol
index a5b761d30..b03cb2b7a 100644
--- a/src/adi/test/ADITestBase.sol
+++ b/src/adi/test/ADITestBase.sol
@@ -19,6 +19,7 @@ import {GovernanceV3Base} from 'aave-address-book/GovernanceV3Base.sol';
 import {GovernanceV3Arbitrum} from 'aave-address-book/GovernanceV3Arbitrum.sol';
 import {GovernanceV3Gnosis} from 'aave-address-book/GovernanceV3Gnosis.sol';
 import {GovernanceV3Scroll} from 'aave-address-book/GovernanceV3Scroll.sol';
+import {GovernanceV3ZkSync} from 'aave-address-book/GovernanceV3ZkSync.sol';
 import {IBaseAdapter} from 'aave-address-book/common/IBaseAdapter.sol';
 
 contract ADITestBase is Test {
@@ -586,7 +587,7 @@ contract ADITestBase is Test {
     uint256 chainId
   ) internal pure returns (uint256[] memory) {
     if (chainId == ChainIds.MAINNET) {
-      uint256[] memory chainIds = new uint256[](10);
+      uint256[] memory chainIds = new uint256[](11);
       chainIds[0] = ChainIds.MAINNET;
       chainIds[1] = ChainIds.POLYGON;
       chainIds[2] = ChainIds.AVALANCHE;
@@ -597,6 +598,7 @@ contract ADITestBase is Test {
       chainIds[7] = ChainIds.METIS;
       chainIds[8] = ChainIds.BASE;
       chainIds[9] = ChainIds.SCROLL;
+      chainIds[10] = ChainIds.ZK_SYNC;
 
       return chainIds;
     } else if (chainId == ChainIds.POLYGON) {
@@ -672,6 +674,8 @@ contract ADITestBase is Test {
       return GovernanceV3Gnosis.CROSS_CHAIN_CONTROLLER;
     } else if (chainId == ChainIds.SCROLL) {
       return GovernanceV3Scroll.CROSS_CHAIN_CONTROLLER;
+    } else if (chainId == ChainIds.ZK_SYNC) {
+      return GovernanceV3ZkSync.CROSS_CHAIN_CONTROLLER;
     }
     revert();
   }