diff --git a/contracts/package.json b/contracts/package.json
index 921b6b96dc..dc2a61c7ec 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -76,7 +76,6 @@
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@openzeppelin/contracts": "^5.0.2",
     "@zk-kit/imt.sol": "2.0.0-beta.12",
-    "buffer": "^6.0.3",
     "circomlibjs": "^0.1.7",
     "ethers": "^6.12.1",
     "hardhat": "^2.22.4",
diff --git a/contracts/tasks/deploy/maci/02-gatekeepers.ts b/contracts/tasks/deploy/maci/02-gatekeepers.ts
index ec13659905..9a7efc4732 100644
--- a/contracts/tasks/deploy/maci/02-gatekeepers.ts
+++ b/contracts/tasks/deploy/maci/02-gatekeepers.ts
@@ -126,7 +126,7 @@ deployment.deployTask("full:deploy-gatekeepers", "Deploy gatekeepers").then((tas
       const validSigner2 = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "signer2", true);
       let verifier: string | undefined = deployment.getDeployConfigField<string>(
         EContracts.ZupassGatekeeper,
-        "groth16Verifier",
+        "zupassVerifier",
       );
       if (!verifier) {
         const verifierContract = await deployment.deployContract({
diff --git a/contracts/tasks/deploy/maci/08-maci.ts b/contracts/tasks/deploy/maci/08-maci.ts
index ae6dbe7234..504e97c6fc 100644
--- a/contracts/tasks/deploy/maci/08-maci.ts
+++ b/contracts/tasks/deploy/maci/08-maci.ts
@@ -74,9 +74,7 @@ deployment.deployTask("full:deploy-maci", "Deploy MACI contract").then((task) =>
       const maciInstanceAddress = await maciContract.getAddress();
 
       await gatekeeperContract.setMaciInstance(maciInstanceAddress).then((tx) => tx.wait());
-    }
-
-    if (gatekeeper === EContracts.GitcoinPassportGatekeeper) {
+    } else if (gatekeeper === EContracts.GitcoinPassportGatekeeper) {
       const gatekeeperContract = await deployment.getContract<GitcoinPassportGatekeeper>({
         name: EContracts.GitcoinPassportGatekeeper,
         address: gatekeeperContractAddress,
@@ -84,8 +82,7 @@ deployment.deployTask("full:deploy-maci", "Deploy MACI contract").then((task) =>
       const maciInstanceAddress = await maciContract.getAddress();
 
       await gatekeeperContract.setMaciInstance(maciInstanceAddress).then((tx) => tx.wait());
-    }
-    if (gatekeeper === EContracts.ZupassGatekeeper) {
+    } else if (gatekeeper === EContracts.ZupassGatekeeper) {
       const gatekeeperContract = await deployment.getContract<ZupassGatekeeper>({
         name: EContracts.ZupassGatekeeper,
         address: gatekeeperContractAddress,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 439972d069..8dc3747792 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -247,9 +247,6 @@ importers:
       '@zk-kit/imt.sol':
         specifier: 2.0.0-beta.12
         version: 2.0.0-beta.12
-      buffer:
-        specifier: ^6.0.3
-        version: 6.0.3
       circomlibjs:
         specifier: ^0.1.7
         version: 0.1.7
@@ -10978,6 +10975,7 @@ packages:
 
   /glob@7.1.7:
     resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==}
+    deprecated: Glob versions prior to v9 are no longer supported
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6