diff --git a/contracts/AgentRewardV2.sol b/contracts/AgentRewardV2.sol
index 3f5da12..f416f6b 100644
--- a/contracts/AgentRewardV2.sol
+++ b/contracts/AgentRewardV2.sol
@@ -5,7 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import {IERC5805} from "@openzeppelin/contracts/interfaces/IERC5805.sol";
 import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import "./virtualPersona/IAgentNft.sol";
@@ -19,7 +19,7 @@ import "./IAgentReward.sol";
 contract AgentRewardV2 is
     IAgentReward,
     Initializable,
-    AccessControl,
+    AccessControlUpgradeable,
     TokenSaver
 {
     using Math for uint256;
diff --git a/contracts/AgentRewardV3.sol b/contracts/AgentRewardV3.sol
index 2c893af..3e9bc4e 100644
--- a/contracts/AgentRewardV3.sol
+++ b/contracts/AgentRewardV3.sol
@@ -5,7 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";
 import {IERC5805} from "@openzeppelin/contracts/interfaces/IERC5805.sol";
 import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
@@ -22,7 +22,7 @@ import "./IAgentRewardV3.sol";
 contract AgentRewardV3 is
     IAgentRewardV3,
     Initializable,
-    AccessControl,
+    AccessControlUpgradeable,
     TokenSaver
 {
     using Math for uint256;
diff --git a/contracts/virtualPersona/AgentFactory.sol b/contracts/virtualPersona/AgentFactory.sol
index 0dcbd9e..3d4b42d 100644
--- a/contracts/virtualPersona/AgentFactory.sol
+++ b/contracts/virtualPersona/AgentFactory.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/governance/IGovernor.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 
 import "./IAgentFactory.sol";
@@ -19,7 +19,7 @@ import "../libs/IERC6551Registry.sol";
 contract AgentFactoryV2 is
     IAgentFactory,
     Initializable,
-    AccessControl,
+    AccessControlUpgradeable,
     PausableUpgradeable
 {
     using SafeERC20 for IERC20;
diff --git a/contracts/virtualPersona/AgentFactoryV3.sol b/contracts/virtualPersona/AgentFactoryV3.sol
index b8b308e..a1d0d22 100644
--- a/contracts/virtualPersona/AgentFactoryV3.sol
+++ b/contracts/virtualPersona/AgentFactoryV3.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/governance/IGovernor.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 
 import "./IAgentFactoryV3.sol";
@@ -19,7 +19,7 @@ import "../libs/IERC6551Registry.sol";
 contract AgentFactoryV3 is
     IAgentFactoryV3,
     Initializable,
-    AccessControl,
+    AccessControlUpgradeable,
     PausableUpgradeable
 {
     using SafeERC20 for IERC20;
diff --git a/contracts/virtualPersona/AgentFactoryV4.sol b/contracts/virtualPersona/AgentFactoryV4.sol
index 7ff5cff..8e6564d 100644
--- a/contracts/virtualPersona/AgentFactoryV4.sol
+++ b/contracts/virtualPersona/AgentFactoryV4.sol
@@ -6,7 +6,7 @@ import "@openzeppelin/contracts/governance/IGovernor.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/access/AccessControl.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 
 import "./IAgentFactoryV4.sol";
@@ -21,7 +21,7 @@ import "../pool/IUniswapV2Router02.sol";
 contract AgentFactoryV4 is
     IAgentFactoryV4,
     Initializable,
-    AccessControl,
+    AccessControlUpgradeable,
     PausableUpgradeable
 {
     using SafeERC20 for IERC20;
diff --git a/package.json b/package.json
index 117554c..e3d1a7e 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,8 @@
     "@account-abstraction/contracts": "^0.6.0",
     "@fireblocks/hardhat-fireblocks": "^1.3.5",
     "@nomicfoundation/hardhat-verify": "^2.0.3",
-    "@openzeppelin/contracts": "5.0.0",
-    "@openzeppelin/contracts-upgradeable": "^5.0.1",
+    "@openzeppelin/contracts": "5.1.0",
+    "@openzeppelin/contracts-upgradeable": "5.1.0",
     "@openzeppelin/hardhat-upgrades": "^3.0.2",
     "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
diff --git a/yarn.lock b/yarn.lock
index c0cbd34..e34e36e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -865,15 +865,15 @@
     tslib "^2.5.0"
     uuid "^9.0.0"
 
-"@openzeppelin/contracts-upgradeable@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.1.tgz#ebc163cbed2de6b8b69bff628261d18deb912a81"
-  integrity sha512-MvaLoPnVcoZr/qqZP+4cl9piuR4gg0iIGgxVSZ/AL1iId3M6IdEHzz9Naw5Lirl4KKBI6ciTVnX07yL4dOMIJg==
-
-"@openzeppelin/contracts@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.0.tgz#ee0e4b4564f101a5c4ee398cd4d73c0bd92b289c"
-  integrity sha512-bv2sdS6LKqVVMLI5+zqnNrNU/CA+6z6CmwFXm/MzmOPBRSO5reEJN7z0Gbzvs0/bv/MZZXNklubpwy3v2+azsw==
+"@openzeppelin/contracts-upgradeable@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.1.0.tgz#4d37648b7402929c53e2ff6e45749ecff91eb2b6"
+  integrity sha512-AIElwP5Ck+cslNE+Hkemf5SxjJoF4wBvvjxc27Rp+9jaPs/CLIaUBMYe1FNzhdiN0cYuwGRmYaRHmmntuiju4Q==
+
+"@openzeppelin/contracts@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.1.0.tgz#4e61162f2a2bf414c4e10c45eca98ce5f1aadbd4"
+  integrity sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==
 
 "@openzeppelin/defender-admin-client@^1.52.0":
   version "1.54.1"