diff --git a/deploy/01_poseidon_t3.js b/deploy/PoseidonT3.js
similarity index 87%
rename from deploy/01_poseidon_t3.js
rename to deploy/PoseidonT3.js
index 44ac4f51..7921b54a 100644
--- a/deploy/01_poseidon_t3.js
+++ b/deploy/PoseidonT3.js
@@ -11,4 +11,4 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
         bytecode: poseidonGenContract.createCode(2)
     });
 };
-module.exports.tags = ['poseidon-t3', 'poseidon'];
\ No newline at end of file
+module.exports.tags = ['PoseidonT3', 'Poseidon', 'complete'];
\ No newline at end of file
diff --git a/deploy/02_poseidon_t6.js b/deploy/PoseidonT6.js
similarity index 80%
rename from deploy/02_poseidon_t6.js
rename to deploy/PoseidonT6.js
index 0b7fcb8a..044f157b 100644
--- a/deploy/02_poseidon_t6.js
+++ b/deploy/PoseidonT6.js
@@ -4,11 +4,12 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
 
-    await deploy("PoseidonT3", {
+    await deploy("PoseidonT6", {
         from: deployer,
         log: true,
         abi: poseidonGenContract.generateABI(5),
         bytecode: poseidonGenContract.createCode(5)
     });
 };
-module.exports.tags = ['poseidon-t6', 'poseidon'];
\ No newline at end of file
+
+module.exports.tags = ['PoseidonT6', 'Poseidon', 'complete'];
diff --git a/deploy/1_complete.js b/deploy/Semaphore.js
similarity index 54%
rename from deploy/1_complete.js
rename to deploy/Semaphore.js
index d131dcd4..916b5731 100644
--- a/deploy/1_complete.js
+++ b/deploy/Semaphore.js
@@ -1,23 +1,12 @@
-const { poseidon_gencontract: poseidonGenContract } = require('circomlibjs');
 const { genExternalNullifier } = require('../utils');
 
 module.exports = async ({ getNamedAccounts, deployments }) => {
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-
-    const poseidonT3 = await deploy("PoseidonT3", {
-        from: deployer,
-        log: true,
-        abi: poseidonGenContract.generateABI(2),
-        bytecode: poseidonGenContract.createCode(2)
-    });
-
-    const poseidonT6 = await deploy("PoseidonT6", {
-        from: deployer,
-        log: true,
-        abi: poseidonGenContract.generateABI(5),
-        bytecode: poseidonGenContract.createCode(5)
-    });
+    // const poseidonT3 = await hre.ethers.getContractAt("PoseidonT3")
+    // const poseidonT6 = await hre.ethers.getContractAt("PoseidonT6")
+    const poseidonT3 = await deployments.get("PoseidonT3")
+    const poseidonT6 = await deployments.get("PoseidonT6")
 
     const externalNullifier = genExternalNullifier('test-voting');
     const semaphore = await deploy('Semaphore', {
@@ -36,4 +25,5 @@ module.exports = async ({ getNamedAccounts, deployments }) => {
       args: [semaphore.address],
     });
 };
-module.exports.tags = ['complete'];
\ No newline at end of file
+module.exports.tags = ['complete'];
+module.exports.dependencies = ['PoseidonT3', 'PoseidonT6'];
diff --git a/package-lock.json b/package-lock.json
index 15bb0cac..1e05b303 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@libsem/protocols": "^1.0.9",
         "circomlib": "^0.5.3",
         "hardhat-deploy": "^0.9.4",
+        "hardhat-deploy-ethers": "^0.3.0-beta.11",
         "web3": "^1.5.2"
       },
       "devDependencies": {
@@ -16654,6 +16655,15 @@
         "hardhat": "^2.0.0"
       }
     },
+    "node_modules/hardhat-deploy-ethers": {
+      "version": "0.3.0-beta.11",
+      "resolved": "https://registry.npmjs.org/hardhat-deploy-ethers/-/hardhat-deploy-ethers-0.3.0-beta.11.tgz",
+      "integrity": "sha512-HnniBGBYsFRQDXBy3bQ27i86pQQnHkN0Mxdwiu869jZURY2gDQ4OEZxcXItnWQqBjYiEaavVyw/Xle7qwKOBAg==",
+      "peerDependencies": {
+        "ethers": "^5.0.0",
+        "hardhat": "^2.0.0"
+      }
+    },
     "node_modules/hardhat-deploy/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -39741,6 +39751,12 @@
         }
       }
     },
+    "hardhat-deploy-ethers": {
+      "version": "0.3.0-beta.11",
+      "resolved": "https://registry.npmjs.org/hardhat-deploy-ethers/-/hardhat-deploy-ethers-0.3.0-beta.11.tgz",
+      "integrity": "sha512-HnniBGBYsFRQDXBy3bQ27i86pQQnHkN0Mxdwiu869jZURY2gDQ4OEZxcXItnWQqBjYiEaavVyw/Xle7qwKOBAg==",
+      "requires": {}
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
diff --git a/package.json b/package.json
index daeacaa9..ea7503b8 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "@libsem/protocols": "^1.0.9",
     "circomlib": "^0.5.3",
     "hardhat-deploy": "^0.9.4",
+    "hardhat-deploy-ethers": "^0.3.0-beta.11",
     "web3": "^1.5.2"
   },
   "devDependencies": {