diff --git a/solidity/ecdsa/contracts/WalletRegistry.sol b/solidity/ecdsa/contracts/WalletRegistry.sol
index f0b5a86dc0..f7e58e134e 100644
--- a/solidity/ecdsa/contracts/WalletRegistry.sol
+++ b/solidity/ecdsa/contracts/WalletRegistry.sol
@@ -32,6 +32,9 @@ import "@keep-network/random-beacon/contracts/ReimbursementPool.sol";
 import "@threshold-network/solidity-contracts/contracts/staking/IApplication.sol";
 import "@threshold-network/solidity-contracts/contracts/staking/IStaking.sol";
 
+// TODO: We used RC version of @openzeppelin/contracts-upgradeable to use `reinitializer`
+// in upgrades. We should revisit this part before mainnet deployment and use
+// a final release package if it's ready.
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 contract WalletRegistry is
@@ -261,8 +264,8 @@ contract WalletRegistry is
 
         // TODO: revisit all initial values
 
-        dkgResultSubmissionGas = 288_000;
-        dkgResultApprovalGasOffset = 62_000;
+        dkgResultSubmissionGas = 272_000;
+        dkgResultApprovalGasOffset = 63_000;
         notifyOperatorInactivityGasOffset = 86_000;
 
         sortitionPoolRewardsBanDuration = 2 weeks;
diff --git a/solidity/ecdsa/package.json b/solidity/ecdsa/package.json
index 024678fcc3..df356e5510 100644
--- a/solidity/ecdsa/package.json
+++ b/solidity/ecdsa/package.json
@@ -68,6 +68,7 @@
     "@keep-network/random-beacon": "development",
     "@keep-network/sortition-pools": "^2.0.0-pre.6",
     "@openzeppelin/contracts": "^4.4.1",
+    "@openzeppelin/contracts-upgradeable": "^4.6.0-rc.0",
     "@threshold-network/solidity-contracts": ">1.1.0-dev <1.1.0-ropsten"
   },
   "engines": {
diff --git a/solidity/ecdsa/yarn.lock b/solidity/ecdsa/yarn.lock
index f7248fbcfa..4996e758b6 100644
--- a/solidity/ecdsa/yarn.lock
+++ b/solidity/ecdsa/yarn.lock
@@ -690,6 +690,11 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.5.1.tgz#dc354082460eb34f5833afdecfab46538b208c4f"
   integrity sha512-xcKycsSyFauIGMhSeeTJW/Jzz9jZUJdiFNP9Wo/9VhMhw8t5X0M92RY6x176VfcIWsxURMHFWOJVTlFA78HI/w==
 
+"@openzeppelin/contracts-upgradeable@^4.6.0-rc.0":
+  version "4.6.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.6.0-rc.0.tgz#80b6dcff3167ab2f86f9d08e6bd60c0332a5fee5"
+  integrity sha512-IQo98b6AlCGqpdgW1pxsUucqMu8x6WFJmusKMS4qoaVm3cifA/aQM/klHIAdr3pmVeZRjIM1gywQU85jzWEnAA==
+
 "@openzeppelin/contracts@^4.1.0", "@openzeppelin/contracts@^4.3.2", "@openzeppelin/contracts@^4.4", "@openzeppelin/contracts@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.4.2.tgz#4e889c9c66e736f7de189a53f8ba5b8d789425c2"