diff --git a/migrations/upgrade.ts b/migrations/upgrade.ts
index 5837a41..1403416 100644
--- a/migrations/upgrade.ts
+++ b/migrations/upgrade.ts
@@ -1,5 +1,5 @@
-import {AutoSubmitter, Upgrader} from "@skalenetwork/upgrade-tools";
 import {Instance, skaleContracts} from "@skalenetwork/skale-contracts-ethers-v6";
+import {Submitter, Upgrader} from "@skalenetwork/upgrade-tools";
 import {Paymaster} from "../typechain-types";
 import {Transaction} from "ethers";
 import chalk from "chalk";
@@ -35,7 +35,7 @@ interface UpgradeContext {
 class PaymasterUpgrader extends Upgrader {
     constructor(
         context: UpgradeContext,
-        submitter = new AutoSubmitter()
+        submitter?: Submitter
     ) {
         super(
             {
diff --git a/package.json b/package.json
index 8bd6890..8431a7a 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@quant-finance/solidity-datetime": "^2.2.0",
     "@skalenetwork/paymaster-interfaces": "main",
     "@skalenetwork/skale-contracts-ethers-v6": "^1.0.2-develop.0",
-    "@skalenetwork/upgrade-tools": "3.0.0-develop.13",
+    "@skalenetwork/upgrade-tools": "3.0.0-develop.21",
     "chalk": "^4",
     "dotenv": "^16.4.5"
   }
diff --git a/scripts/test_upgrade.sh b/scripts/test_upgrade.sh
index bad523c..7c23f4e 100755
--- a/scripts/test_upgrade.sh
+++ b/scripts/test_upgrade.sh
@@ -37,7 +37,7 @@ echo "Deploy previous version"
 DEPLOY_OUTPUT_FILE="$GITHUB_WORKSPACE/data/deploy.txt"
 VERSION=$DEPLOYED_VERSION yarn exec hardhat run migrations/deploy.ts --network localhost > $DEPLOY_OUTPUT_FILE
 rm $GITHUB_WORKSPACE/.openzeppelin/unknown-*.json || true
-cp .openzeppelin/unknown-*.json $GITHUB_WORKSPACE/.openzeppelin
+cp .openzeppelin/unknown-*.json "$GITHUB_WORKSPACE/.openzeppelin/"
 PAYMASTER_ADDRESS=$(cat $DEPLOY_OUTPUT_FILE | grep "Paymaster address" | awk '{print $NF}')
 
 cd $GITHUB_WORKSPACE
diff --git a/yarn.lock b/yarn.lock
index e76251c..ee64365 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1904,9 +1904,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@skalenetwork/upgrade-tools@npm:3.0.0-develop.13":
-  version: 3.0.0-develop.13
-  resolution: "@skalenetwork/upgrade-tools@npm:3.0.0-develop.13"
+"@skalenetwork/upgrade-tools@npm:3.0.0-develop.21":
+  version: 3.0.0-develop.21
+  resolution: "@skalenetwork/upgrade-tools@npm:3.0.0-develop.21"
   dependencies:
     "@safe-global/api-kit": ^2.4.1
     "@safe-global/protocol-kit": ^4.0.1
@@ -1923,7 +1923,7 @@ __metadata:
     "@types/mocha": ^9.1.0
     ethers: ^6.7.1
     hardhat: ^2.9.9
-  checksum: a9fc5a674ad69975bbaedd6f4116b5e05e8ba9250f0b6d4283921461abc3949a82900371ac6ca495d06288cb6e734df4a8e938a07ab19da45d2342f0bba2b128
+  checksum: a50d0ff7acfb9c7e940ee59217733dfad3721a6aeabd2b6427a4cda8a46f3c79ef389227690e156b62d59ede84205cb7f040e04d1b1de85013f05da12037b616
   languageName: node
   linkType: hard
 
@@ -7064,7 +7064,7 @@ __metadata:
     "@quant-finance/solidity-datetime": ^2.2.0
     "@skalenetwork/paymaster-interfaces": main
     "@skalenetwork/skale-contracts-ethers-v6": ^1.0.2-develop.0
-    "@skalenetwork/upgrade-tools": 3.0.0-develop.13
+    "@skalenetwork/upgrade-tools": 3.0.0-develop.21
     "@typechain/ethers-v6": ^0.5.1
     "@typechain/hardhat": ^9.1.0
     "@types/chai": ^4.3.11