diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml
index 39bab32e2..9bd08b1fc 100644
--- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml
+++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml
@@ -4,11 +4,11 @@ deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496"
 era_chain_id = 9
 force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044016be2c4df653dc16d4f32b0da783b6ffcb4b9f102604d126f3ce7927d739f36c00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000001fc36471c3e2b43168f0632490d41dc71e347fcc2b3068bbf03276e9dd6cbb5b00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002"
 l1_chain_id = 31337
-multicall3_addr = "0x8104449AfB19B799b84A1355B866FcfB6a3482c9"
+multicall3_addr = "0x0cbaE56294C5e394648A323238F6428bD0D0Bc35"
 owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8"
 
 [contracts_config]
-diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000651bc2096869af5bf1fc577e597951657ede916b0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000007cae28f41cb79cc7f841adce0af49c24f7dcdb5100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000005b4d0d51c1adcfdc69fae6a0872acf9bdb0039fc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000007df73fcdc41ee1668fc2ff9737ec4da17c50e14f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000830bba67e7aea3ef4c1657bbb0895986f1117c9a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e1beb08050bdbe3efdd92ab8e9679129bc245cfe000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241"
+diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000dea634df59ae14b62f4e9875196b4ff86f1f90fd0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000207d7fa7b533ec0b9f64e66b04756b90bbfa869400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000ccbff7e1593e966d85ad89954f5e3ee8dfff97ad000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000ffc625196eaa62687256cf61a60dfff06ac5083d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000fb1829d7c11028b7b8e56ba684ad928ec7812c17000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000008f3c4d76725e03f1fff1c53f88bb685b447143d8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241"
 diamond_init_batch_overhead_l1_gas = 1000000
 diamond_init_max_l2_gas_per_batch = 80000000
 diamond_init_max_pubdata_per_batch = 120000
@@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000
 
 [deployed_addresses]
 blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241"
-governance_addr = "0xa8b67e5b6057AB84a9Ce90bce823b878b784C879"
-native_token_vault_addr = "0xC57952fa081Ba70555C265DA8ffdEc237618c223"
+governance_addr = "0x9F9E84e66a6604D489478Abb441fA29EE00d6b3c"
+native_token_vault_addr = "0x8edF0E9de19042FB9106618Ea14959D54A422729"
 transparent_proxy_admin_addr = "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351"
-validator_timelock_addr = "0xda258d9e22d6eF08EE1581F1Eb716f583AFb3423"
+validator_timelock_addr = "0xF1E54EFa3ddad166A15a71746E81674790B25E78"
 
 [deployed_addresses.bridgehub]
-bridgehub_implementation_addr = "0x67DE4c766899518ddE0f11443E4e40C4796f6498"
-bridgehub_proxy_addr = "0xA939C53cB66E4F85f9A9D6f2E2A8712abDEfA25c"
-ctm_deployment_tracker_implementation_addr = "0x1E1d045A215d46f2a4e2Da94C672232479DCa485"
-ctm_deployment_tracker_proxy_addr = "0x118D2781A259EE14e37b876F4A5c0498912F9127"
-message_root_implementation_addr = "0xbE1e2Ea6Ea4399B4F1Ec5a9718950312D600fb08"
-message_root_proxy_addr = "0x10062969347aCC9B6dd8fB7c89De9B082aCf17CF"
+bridgehub_implementation_addr = "0xf6bE6Dd45254b1Cd91d0Ca773c47E3a19eC5383a"
+bridgehub_proxy_addr = "0xae3175922eA3D3e1f63698b9DEeCC9a24dCCd30d"
+ctm_deployment_tracker_implementation_addr = "0xB5Cf80879f9B2dC1F000E2E8D75afBd5b6cbFA19"
+ctm_deployment_tracker_proxy_addr = "0x6306C2F2d254c965E8E32CCEFdC8D0E5E97D1920"
+message_root_implementation_addr = "0xCA3359AC26749d07F3Db2D124e12CF25B380E0Cd"
+message_root_proxy_addr = "0xC018530eE9aa956Cc3F3cc943a27Bf0AAb0286Cf"
 
 [deployed_addresses.bridges]
-erc20_bridge_implementation_addr = "0x40021F838987715e71625e05eDB94f402f3d4786"
-erc20_bridge_proxy_addr = "0x47bBC633dadbCEDE4DAf68751483F5c7C263a278"
-shared_bridge_implementation_addr = "0xeB6C162983c4B8681316FB7d5b34D3fF9352Bb53"
-shared_bridge_proxy_addr = "0xeD2507CFF9e5690CDb44d1Cd1949305Ca8b458b9"
+erc20_bridge_implementation_addr = "0xD32fc9de19Aa3cCf41d48934d4375F03397F2438"
+erc20_bridge_proxy_addr = "0xeA108c45022Ac85f3be36eE16d7280AD273Ec4bD"
+shared_bridge_implementation_addr = "0x4A44383DbDD11EcdBC89e1eD1AA73Fa650acFab6"
+shared_bridge_proxy_addr = "0xaE93f79B59BF1CA684F8C4F4aC58F790a68bdF5e"
 
 [deployed_addresses.state_transition]
-admin_facet_addr = "0x7cAe28F41CB79CC7F841adCE0aF49c24F7DCDB51"
-default_upgrade_addr = "0xb4E9746a837B35D1ddA4164Ec72452De644fB278"
-diamond_init_addr = "0x651bC2096869af5bf1FC577e597951657edE916B"
+admin_facet_addr = "0x207D7fA7b533Ec0b9f64e66B04756B90Bbfa8694"
+default_upgrade_addr = "0x6D26D095d92f6AE10E43A0bd6aba1fa4A6146a75"
+diamond_init_addr = "0xDeA634df59ae14b62F4e9875196b4Ff86F1F90FD"
 diamond_proxy_addr = "0x0000000000000000000000000000000000000000"
-executor_facet_addr = "0x830BbA67e7aea3eF4c1657BBb0895986F1117c9A"
-genesis_upgrade_addr = "0x00b65597C31CFe4476f7A1615052Ff8957a14fE0"
-getters_facet_addr = "0x5B4d0d51c1aDcFdc69faE6a0872ACF9Bdb0039FC"
-mailbox_facet_addr = "0x7DF73fcdC41EE1668FC2FF9737ec4da17C50e14f"
-state_transition_implementation_addr = "0x65b859991966F0626Ee813cb0e877c6e6C47a8F8"
-state_transition_proxy_addr = "0x1D22ED3CC52FF42a1DcD5579e08745C5216170b3"
-verifier_addr = "0xe1Beb08050bdBE3EFdD92Ab8E9679129bC245cfE"
+executor_facet_addr = "0xFB1829d7c11028b7B8e56bA684ad928EC7812C17"
+genesis_upgrade_addr = "0x57b697a6Dc1fFDAc922710B6D7F8f8953C336988"
+getters_facet_addr = "0xcCbfF7E1593e966d85AD89954f5e3ee8dffF97ad"
+mailbox_facet_addr = "0xfFc625196eAA62687256cF61a60DFFf06ac5083d"
+state_transition_implementation_addr = "0xA43901D5d901239E6B18b579379d906769778beD"
+state_transition_proxy_addr = "0x4E567C2165d04893932d4E3E8B51C67a00C8Cbf4"
+verifier_addr = "0x8F3c4D76725e03F1FFf1C53f88BB685b447143D8"
diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol
index f2f1b645e..645f2ae5f 100644
--- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol
+++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.24;
 
 import {Test} from "forge-std/Test.sol";
 
-import "openzeppelin-contracts/contracts-v4/utils/Strings.sol";
+import "@openzeppelin/contracts-v4/utils/Strings.sol";
 import "forge-std/console.sol";
 import {IChainAdmin} from "contracts/governance/IChainAdmin.sol";
 import {ChainAdmin} from "contracts/governance/ChainAdmin.sol";
diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol
index 1c0f929d1..567c6d999 100644
--- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol
+++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.24;
 
 import {Test} from "forge-std/Test.sol";
 
-import "openzeppelin-contracts/contracts-v4/utils/Strings.sol";
+import "@openzeppelin/contracts-v4/utils/Strings.sol";
 import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol";
 import {IChainAdmin} from "contracts/governance/IChainAdmin.sol";
 import {ChainAdmin} from "contracts/governance/ChainAdmin.sol";
diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol
index de9c6611b..9d16611d1 100644
--- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol
+++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.8.24;
 
-import "openzeppelin-contracts/contracts-v4/utils/Strings.sol";
+import "@openzeppelin/contracts-v4/utils/Strings.sol";
 import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol";
 import {Diamond} from "contracts/state-transition/libraries/Diamond.sol";
 import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol";