diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml
index 85d70d9..a419e21 100644
--- a/.github/workflows/contracts.yml
+++ b/.github/workflows/contracts.yml
@@ -45,10 +45,10 @@ jobs:
       - name: Setup LCOV
         uses: hrishikesh-kadam/setup-lcov@6c1aa0cc9e1c02f9f58f01ac599f1064ccc83470 # v1
 
-      - name: Install Node.js 18
+      - name: Install Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '22'
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
diff --git a/foundry.toml b/foundry.toml
index 3d4847b..166fb06 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -10,17 +10,6 @@ ast = true
 build_info = true
 extra_output = ["storageLayout"]
 
-remappings = [
-    '@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/',
-    '@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/',
-    '@layerzerolabs/lz-evm-protocol-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/protocol/',
-    '@layerzerolabs/lz-evm-messagelib-v2/=lib/layerzero-v2/packages/layerzero-v2/evm/messagelib/',
-    "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/",
-    "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/",
-    "openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/",
-    'solidity-bytes-utils/=lib/solidity-bytes-utils/',
-]
-
 # Network configurations
 [rpc_endpoints]
 scroll = "${SCROLL_MAINNET_RPC}"
diff --git a/remappings.txt b/remappings.txt
new file mode 100644
index 0000000..6937de8
--- /dev/null
+++ b/remappings.txt
@@ -0,0 +1,8 @@
+@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+openzeppelin-foundry-upgrades/=lib/openzeppelin-foundry-upgrades/src/
+solidity-bytes-utils/=lib/solidity-bytes-utils/
+@layerzerolabs/oapp-evm/=lib/devtools/packages/oapp-evm/
+@layerzerolabs/oft-evm/=lib/devtools/packages/oft-evm/
+@layerzerolabs/lz-evm-messagelib-v2/=lib/LayerZero-v2/packages/layerzero-v2/evm/messagelib/
+@layerzerolabs/lz-evm-protocol-v2/=lib/LayerZero-v2/packages/layerzero-v2/evm/protocol/