diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 5d7cf63e..7a0f19cf 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.4 (2024-10-23)
+
+### Potentially breaking changes
+- Update pragma versions to 0.8.22. ([#401](https://github.com/OpenZeppelin/contracts-wizard/pull/401))
+
 ## 0.4.3 (2024-04-08)
 
 - Add timestamp based Governor and Votes clock options. ([#347](https://github.com/OpenZeppelin/contracts-wizard/pull/347))
diff --git a/packages/core/package.json b/packages/core/package.json
index 01de713a..e6ce894a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",
@@ -20,8 +20,8 @@
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"
   },
   "devDependencies": {
-    "@openzeppelin/contracts": "^5.0.0",
-    "@openzeppelin/contracts-upgradeable": "^5.0.0",
+    "@openzeppelin/contracts": "^5.1.0",
+    "@openzeppelin/contracts-upgradeable": "^5.1.0",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.5.7",
     "array.prototype.flat": "^1.2.4",
diff --git a/packages/core/src/contract.test.ts.md b/packages/core/src/contract.test.ts.md
index 2e11f32e..f4d77b57 100644
--- a/packages/core/src/contract.test.ts.md
+++ b/packages/core/src/contract.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
     }␊
@@ -22,7 +22,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "./Bar.sol";␊
     ␊
@@ -36,7 +36,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "./Bar.sol";␊
     import "./Quux.sol";␊
@@ -51,7 +51,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "./Bar.sol";␊
     ␊
@@ -66,7 +66,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "./Bar.sol";␊
     import "./Quux.sol";␊
@@ -82,7 +82,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
     }␊
@@ -94,7 +94,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         // The following functions are overrides required by Solidity.␊
@@ -114,7 +114,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         // The following functions are overrides required by Solidity.␊
@@ -138,7 +138,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         function _otherFunction() internal whenNotPaused {}␊
@@ -151,7 +151,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         function _otherFunction() internal whenNotPaused override(ERC20, OtherParent) {␊
@@ -166,7 +166,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         constructor() {␊
@@ -181,7 +181,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "./Bar.sol";␊
     ␊
@@ -198,7 +198,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         function _otherFunction() internal {␊
@@ -213,7 +213,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         function _otherFunction() internal override {␊
@@ -229,7 +229,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         uint value = 42;␊
@@ -242,7 +242,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
         uint value = 42;␊
@@ -256,7 +256,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract FooBarBaz {␊
     }␊
@@ -268,7 +268,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     /// @custom:security-contact security@example.com␊
     contract Foo {␊
diff --git a/packages/core/src/contract.test.ts.snap b/packages/core/src/contract.test.ts.snap
index 01f06ba1..b1ffc2d9 100644
Binary files a/packages/core/src/contract.test.ts.snap and b/packages/core/src/contract.test.ts.snap differ
diff --git a/packages/core/src/custom.test.ts.md b/packages/core/src/custom.test.ts.md
index 4d5eeee0..46903daa 100644
--- a/packages/core/src/custom.test.ts.md
+++ b/packages/core/src/custom.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract MyContract {␊
     }␊
@@ -22,7 +22,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/utils/Pausable.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -46,7 +46,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
@@ -64,7 +64,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
@@ -95,7 +95,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     contract MyContract {␊
     }␊
@@ -107,7 +107,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
@@ -122,7 +122,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/access/AccessControl.sol";␊
     ␊
@@ -139,7 +139,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     ␊
@@ -154,7 +154,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
diff --git a/packages/core/src/custom.test.ts.snap b/packages/core/src/custom.test.ts.snap
index a15c5c23..0c0eba37 100644
Binary files a/packages/core/src/custom.test.ts.snap and b/packages/core/src/custom.test.ts.snap differ
diff --git a/packages/core/src/environments/hardhat/package-lock.json b/packages/core/src/environments/hardhat/package-lock.json
index 3062df9c..3868b0f7 100644
--- a/packages/core/src/environments/hardhat/package-lock.json
+++ b/packages/core/src/environments/hardhat/package-lock.json
@@ -1595,9 +1595,9 @@
       }
     },
     "node_modules/@openzeppelin/contracts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz",
-      "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.1.0.tgz",
+      "integrity": "sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==",
       "dev": true,
       "license": "MIT"
     },
diff --git a/packages/core/src/environments/hardhat/upgradeable/package-lock.json b/packages/core/src/environments/hardhat/upgradeable/package-lock.json
index 1cffac9a..e7adbd16 100644
--- a/packages/core/src/environments/hardhat/upgradeable/package-lock.json
+++ b/packages/core/src/environments/hardhat/upgradeable/package-lock.json
@@ -1770,20 +1770,20 @@
       }
     },
     "node_modules/@openzeppelin/contracts": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz",
-      "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.1.0.tgz",
+      "integrity": "sha512-p1ULhl7BXzjjbha5aqst+QMLY+4/LCWADXOCsmLHRM77AqiPjnd9vvUN9sosUfhL9JGKpZ0TjEGxgvnizmWGSA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@openzeppelin/contracts-upgradeable": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz",
-      "integrity": "sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.1.0.tgz",
+      "integrity": "sha512-AIElwP5Ck+cslNE+Hkemf5SxjJoF4wBvvjxc27Rp+9jaPs/CLIaUBMYe1FNzhdiN0cYuwGRmYaRHmmntuiju4Q==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@openzeppelin/contracts": "5.0.2"
+        "@openzeppelin/contracts": "5.1.0"
       }
     },
     "node_modules/@openzeppelin/defender-sdk-base-client": {
diff --git a/packages/core/src/erc1155.test.ts.md b/packages/core/src/erc1155.test.ts.md
index 87e9c7c1..7ff0f6e7 100644
--- a/packages/core/src/erc1155.test.ts.md
+++ b/packages/core/src/erc1155.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -70,7 +70,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -93,7 +93,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
@@ -110,7 +110,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -134,7 +134,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -175,7 +175,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -212,7 +212,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -265,7 +265,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -302,7 +302,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -335,7 +335,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
@@ -418,7 +418,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
@@ -511,7 +511,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
diff --git a/packages/core/src/erc1155.test.ts.snap b/packages/core/src/erc1155.test.ts.snap
index d6c29fef..f9162826 100644
Binary files a/packages/core/src/erc1155.test.ts.snap and b/packages/core/src/erc1155.test.ts.snap differ
diff --git a/packages/core/src/erc20.test.ts.md b/packages/core/src/erc20.test.ts.md
index 055f5f4f..b56d1af6 100644
--- a/packages/core/src/erc20.test.ts.md
+++ b/packages/core/src/erc20.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -26,7 +26,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
@@ -43,7 +43,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
@@ -82,7 +82,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
@@ -125,7 +125,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
@@ -164,7 +164,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
@@ -204,7 +204,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -222,7 +222,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -238,7 +238,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -263,7 +263,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -292,7 +292,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -308,7 +308,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -343,7 +343,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -378,7 +378,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -422,7 +422,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
@@ -439,7 +439,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
@@ -514,7 +514,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
@@ -599,7 +599,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
diff --git a/packages/core/src/erc20.test.ts.snap b/packages/core/src/erc20.test.ts.snap
index 93041829..bbe1473f 100644
Binary files a/packages/core/src/erc20.test.ts.snap and b/packages/core/src/erc20.test.ts.snap differ
diff --git a/packages/core/src/erc721.test.ts.md b/packages/core/src/erc721.test.ts.md
index adee1af3..f0cedb01 100644
--- a/packages/core/src/erc721.test.ts.md
+++ b/packages/core/src/erc721.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
@@ -25,7 +25,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
@@ -44,7 +44,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";␊
@@ -86,7 +86,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
@@ -122,7 +122,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
@@ -170,7 +170,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
@@ -218,7 +218,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";␊
@@ -234,7 +234,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
@@ -271,7 +271,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";␊
@@ -309,7 +309,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -332,7 +332,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -368,7 +368,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -391,7 +391,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -417,7 +417,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -451,7 +451,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -485,7 +485,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -528,7 +528,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
@@ -601,7 +601,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
@@ -682,7 +682,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
diff --git a/packages/core/src/erc721.test.ts.snap b/packages/core/src/erc721.test.ts.snap
index 07a77ae0..64c00819 100644
Binary files a/packages/core/src/erc721.test.ts.snap and b/packages/core/src/erc721.test.ts.snap differ
diff --git a/packages/core/src/governor.test.ts.md b/packages/core/src/governor.test.ts.md
index da0a6ecd..f60ee3ff 100644
--- a/packages/core/src/governor.test.ts.md
+++ b/packages/core/src/governor.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -107,7 +107,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -200,7 +200,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -290,7 +290,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -380,7 +380,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
@@ -494,7 +494,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -596,7 +596,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -689,7 +689,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -782,7 +782,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -872,7 +872,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
@@ -986,7 +986,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -1079,7 +1079,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -1176,7 +1176,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -1269,7 +1269,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -1362,7 +1362,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
@@ -1476,7 +1476,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
@@ -1569,7 +1569,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
@@ -1683,7 +1683,7 @@ Generated by [AVA](https://avajs.dev).
 
     `// SPDX-License-Identifier: MIT␊
     // Compatible with OpenZeppelin Contracts ^5.0.0␊
-    pragma solidity ^0.8.20;␊
+    pragma solidity ^0.8.22;␊
     ␊
     import "@openzeppelin/contracts/governance/Governor.sol";␊
     import "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
diff --git a/packages/core/src/governor.test.ts.snap b/packages/core/src/governor.test.ts.snap
index 4374b929..fd365374 100644
Binary files a/packages/core/src/governor.test.ts.snap and b/packages/core/src/governor.test.ts.snap differ
diff --git a/packages/core/src/solidity-version.json b/packages/core/src/solidity-version.json
index aff649c0..3c102146 100644
--- a/packages/core/src/solidity-version.json
+++ b/packages/core/src/solidity-version.json
@@ -1 +1 @@
-"0.8.20"
\ No newline at end of file
+"0.8.22"
\ No newline at end of file
diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index 50c069b7..39860ec1 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -95,7 +95,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -120,7 +120,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {MyToken} from "src/MyToken.sol";␊
@@ -298,7 +298,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -327,7 +327,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
@@ -363,7 +363,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
@@ -489,7 +489,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -517,7 +517,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
@@ -544,7 +544,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
@@ -660,7 +660,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -683,7 +683,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -700,7 +700,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {MyToken} from "src/MyToken.sol";␊
@@ -820,7 +820,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -849,7 +849,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
       import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
@@ -872,7 +872,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
@@ -989,7 +989,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -1008,13 +1008,13 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       contract MyContract {␊
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {MyContract} from "src/MyContract.sol";␊
@@ -1133,7 +1133,7 @@ Generated by [AVA](https://avajs.dev).
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Script} from "forge-std/Script.sol";␊
       import {console} from "forge-std/console.sol";␊
@@ -1163,7 +1163,7 @@ Generated by [AVA](https://avajs.dev).
       `,
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
       import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
@@ -1180,7 +1180,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import {Test} from "forge-std/Test.sol";␊
       import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index b3cd77b1..91dcca5c 100644
Binary files a/packages/core/src/zip-foundry.test.ts.snap and b/packages/core/src/zip-foundry.test.ts.snap differ
diff --git a/packages/core/src/zip-hardhat.test.ts.md b/packages/core/src/zip-hardhat.test.ts.md
index 1c875b51..86654825 100644
--- a/packages/core/src/zip-hardhat.test.ts.md
+++ b/packages/core/src/zip-hardhat.test.ts.md
@@ -11,7 +11,7 @@ Generated by [AVA](https://avajs.dev).
     [
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
       import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
@@ -72,7 +72,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       const config: HardhatUserConfig = {␊
         solidity: {␊
-          version: "0.8.20",␊
+          version: "0.8.22",␊
           settings: {␊
             optimizer: {␊
               enabled: true,␊
@@ -145,7 +145,7 @@ Generated by [AVA](https://avajs.dev).
     [
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
@@ -177,7 +177,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       const config: HardhatUserConfig = {␊
         solidity: {␊
-          version: "0.8.20",␊
+          version: "0.8.22",␊
           settings: {␊
             optimizer: {␊
               enabled: true,␊
@@ -250,7 +250,7 @@ Generated by [AVA](https://avajs.dev).
     [
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       import "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -272,7 +272,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       const config: HardhatUserConfig = {␊
         solidity: {␊
-          version: "0.8.20",␊
+          version: "0.8.22",␊
           settings: {␊
             optimizer: {␊
               enabled: true,␊
@@ -343,7 +343,7 @@ Generated by [AVA](https://avajs.dev).
     [
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       contract MyContract {␊
       }␊
@@ -354,7 +354,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       const config: HardhatUserConfig = {␊
         solidity: {␊
-          version: "0.8.20",␊
+          version: "0.8.22",␊
           settings: {␊
             optimizer: {␊
               enabled: true,␊
@@ -421,7 +421,7 @@ Generated by [AVA](https://avajs.dev).
     [
       `// SPDX-License-Identifier: MIT␊
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
-      pragma solidity ^0.8.20;␊
+      pragma solidity ^0.8.22;␊
       ␊
       import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       ␊
@@ -438,7 +438,7 @@ Generated by [AVA](https://avajs.dev).
       ␊
       const config: HardhatUserConfig = {␊
         solidity: {␊
-          version: "0.8.20",␊
+          version: "0.8.22",␊
           settings: {␊
             optimizer: {␊
               enabled: true,␊
diff --git a/packages/core/src/zip-hardhat.test.ts.snap b/packages/core/src/zip-hardhat.test.ts.snap
index d4930488..8ba480e9 100644
Binary files a/packages/core/src/zip-hardhat.test.ts.snap and b/packages/core/src/zip-hardhat.test.ts.snap differ
diff --git a/yarn.lock b/yarn.lock
index f7aad29e..3d33337d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -488,15 +488,15 @@
     "@nomicfoundation/solidity-analyzer-linux-x64-musl" "0.1.2"
     "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.2"
 
-"@openzeppelin/contracts-upgradeable@^5.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.0.2.tgz#3e5321a2ecdd0b206064356798c21225b6ec7105"
-  integrity sha512-0MmkHSHiW2NRFiT9/r5Lu4eJq5UJ4/tzlOgYXNAIj/ONkQTVnz22pLxDvp4C4uZ9he7ZFvGn3Driptn1/iU7tQ==
+"@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.0.0":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.0.2.tgz#b1d03075e49290d06570b2fd42154d76c2a5d210"
-  integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==
+"@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==
 
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
@@ -519,17 +519,17 @@
   integrity sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==
 
 "@rollup/plugin-commonjs@^28.0.0":
-  version "28.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.0.tgz#44b5e49cb5d5e6233f1e4996013a8649fdbb9557"
-  integrity sha512-BJcu+a+Mpq476DMXG+hevgPSl56bkUoi88dKT8t3RyUp8kGuOh+2bU8Gs7zXDlu+fyZggnJ+iOBGrb/O1SorYg==
+  version "28.0.1"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.1.tgz#e2138e31cc0637676dc3d5cae7739131f7cd565e"
+  integrity sha512-+tNWdlWKbpB3WgBN7ijjYkq9X5uhjmcvyjEght4NmH5fAU++zfQzAJ6wumLS+dNcvwEZhKx2Z+skY8m7v0wGSA==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     commondir "^1.0.1"
     estree-walker "^2.0.2"
-    fdir "^6.1.1"
+    fdir "^6.2.0"
     is-reference "1.2.1"
     magic-string "^0.30.3"
-    picomatch "^2.3.1"
+    picomatch "^4.0.2"
 
 "@rollup/plugin-json@^6.0.0":
   version "6.1.0"
@@ -2443,10 +2443,10 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fdir@^6.1.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.0.tgz#8e80ab4b18a2ac24beebf9d20d71e1bc2627dbae"
-  integrity sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==
+fdir@^6.2.0:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
+  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
 
 figures@^6.0.1:
   version "6.1.0"
@@ -4021,6 +4021,11 @@ picomatch@^3.0.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516"
   integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==
 
+picomatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"