diff --git a/system-contracts/foundry.toml b/system-contracts/foundry.toml
index ee3885489..bd2856137 100644
--- a/system-contracts/foundry.toml
+++ b/system-contracts/foundry.toml
@@ -5,8 +5,8 @@ libs = ["lib"]
 cache_path = "cache-forge"
 evm_version = "paris"
 remappings = [
-    "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/",
-    "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/",
+    "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/",
+    "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/",
 ]
 
 [profile.default.zksync]
diff --git a/system-contracts/lib/openzeppelin-contracts b/system-contracts/lib/openzeppelin-contracts
deleted file mode 120000
index 99aa45507..000000000
--- a/system-contracts/lib/openzeppelin-contracts
+++ /dev/null
@@ -1 +0,0 @@
-../../lib/openzeppelin-contracts
\ No newline at end of file
diff --git a/system-contracts/lib/openzeppelin-contracts-upgradeable b/system-contracts/lib/openzeppelin-contracts-upgradeable
deleted file mode 120000
index f1fc7a76a..000000000
--- a/system-contracts/lib/openzeppelin-contracts-upgradeable
+++ /dev/null
@@ -1 +0,0 @@
-../../lib/openzeppelin-contracts-upgradeable
\ No newline at end of file
diff --git a/system-contracts/lib/openzeppelin-contracts-upgradeable-v4 b/system-contracts/lib/openzeppelin-contracts-upgradeable-v4
new file mode 120000
index 000000000..0551b6016
--- /dev/null
+++ b/system-contracts/lib/openzeppelin-contracts-upgradeable-v4
@@ -0,0 +1 @@
+../../lib/openzeppelin-contracts-upgradeable-v4
\ No newline at end of file
diff --git a/system-contracts/lib/openzeppelin-contracts-v4 b/system-contracts/lib/openzeppelin-contracts-v4
new file mode 120000
index 000000000..693e94537
--- /dev/null
+++ b/system-contracts/lib/openzeppelin-contracts-v4
@@ -0,0 +1 @@
+../../lib/openzeppelin-contracts-v4
\ No newline at end of file