diff --git a/package.json b/package.json
index 7e30281..a1c7552 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Out of the box starting point for building Zodiac modules",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/asgeir-eth/zodiac-module-oz-governor.git"
+    "url": "git+https://github.com/gnosisguild/zodiac-module-oz-governor.git"
   },
   "scripts": {
     "build": "hardhat compile",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/gnosis/zodiac-module-oz-governor",
   "devDependencies": {
-    "@gnosis-guild/zodiac-core": "^2.0.3",
+    "@gnosis-guild/zodiac-core": "^2.0.4",
     "@gnosis.pm/safe-contracts": "^1.3.0",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.7",
     "@nomicfoundation/hardhat-ethers": "^3.0.6",
@@ -64,7 +64,7 @@
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-promise": "^6.0.0",
     "ethers": "^6.13.2",
-    "hardhat": "^2.22.7",
+    "hardhat": "2.22.7",
     "hardhat-gas-reporter": "^2.2.0",
     "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.4.1",
diff --git a/tasks/extract-mastercopy.ts b/tasks/extract-mastercopy.ts
index d6742f2..388cb36 100644
--- a/tasks/extract-mastercopy.ts
+++ b/tasks/extract-mastercopy.ts
@@ -8,7 +8,7 @@ import packageJson from "../package.json"
 const AddressOne = "0x0000000000000000000000000000000000000001"
 
 task("extract:mastercopy", "Extracts and persists current mastercopy build artifacts").setAction(async (_, hre) => {
-  writeMastercopyFromBuild({
+  const { address: erc20VotesAddress } = writeMastercopyFromBuild({
     contractVersion: packageJson.version,
     contractName: "ERC20Votes",
     compilerInput: await hre.run("verify:etherscan-get-minimal-input", {
@@ -68,18 +68,7 @@ task("extract:mastercopy", "Extracts and persists current mastercopy build artif
         "uint256",
         "uint64",
       ],
-      values: [
-        AddressOne,
-        AddressOne,
-        AddressOne,
-        "0x9a73aE387eb97EF59765bd13ECF1E37f28515b70",
-        "",
-        0,
-        100,
-        0,
-        0,
-        0,
-      ],
+      values: [AddressOne, AddressOne, AddressOne, erc20VotesAddress, "", 0, 100, 0, 0, 0],
     },
     salt: "0x0000000000000000000000000000000000000000000000000000000000000000",
   })
diff --git a/yarn.lock b/yarn.lock
index c25354e..74c82a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -309,10 +309,10 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
   integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
-"@gnosis-guild/zodiac-core@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@gnosis-guild/zodiac-core/-/zodiac-core-2.0.3.tgz#8ca7c8254c6d843615b4cd1f50da9af31261f39f"
-  integrity sha512-ZbfGQleaJsMYUFGX0it+iwxAGN2L2UCwtB0e2yy+mhVljXtfjeYjRyi7EPWCodz1UuBr6VmUYtItj+2rHNPRIg==
+"@gnosis-guild/zodiac-core@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@gnosis-guild/zodiac-core/-/zodiac-core-2.0.4.tgz#100aecfaa63cdb3b60360bed078a00648d790646"
+  integrity sha512-Q7OuD21DACwIH6Eo0KwTpVJyusLaV4Pr4x1Jx7TYphd8goiR6oh9QPwk61uNxgqx1rAfN/TDdcc2QcCAEGnKbA==
   dependencies:
     "@gnosis.pm/safe-contracts" "1.3.0"
     "@openzeppelin/contracts" "5.0.2"
@@ -471,7 +471,7 @@
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.5.2.tgz#f16db88bf4fe09a996af0a25096e09deecb72bfa"
   integrity sha512-CcvvuA3sAv7liFNPsIR/68YlH6rrybKzYttLlMr80d4GKJjwJ5OKb3YgE6FdZZnOfP19HEHhsLcE0DPLtY3r0w==
 
-"@nomicfoundation/edr@^0.5.2":
+"@nomicfoundation/edr@^0.5.0":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr/-/edr-0.5.2.tgz#e8c7b3d3dd4a312432ab3930dec60f76dc5c4926"
   integrity sha512-hW/iLvUQZNTVjFyX/I40rtKvvDOqUEyIi96T28YaLfmPL+3LW2lxmYLUXEJ6MI14HzqxDqrLyhf6IbjAa2r3Dw==
@@ -2890,14 +2890,14 @@ hardhat-gas-reporter@^2.2.0:
     sha1 "^1.1.1"
     viem "2.7.14"
 
-hardhat@^2.22.7:
-  version "2.22.9"
-  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.9.tgz#d8f2720561dc60f5cc0ee80c82f9b1907fd61c88"
-  integrity sha512-sWiuI/yRdFUPfndIvL+2H18Vs2Gav0XacCFYY5msT5dHOWkhLxESJySIk9j83mXL31aXL8+UMA9OgViFLexklg==
+hardhat@2.22.7:
+  version "2.22.7"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.7.tgz#3de0ce5074063cf468876c5e62f84c66d2408e8e"
+  integrity sha512-nrXQAl+qUr75TsCLDo8P41YXLc+5U7qQMMCIrbbmy1/uQaVPncdjDrD5BR0CENvHRj7EBqO+JkofpozXoIfJKg==
   dependencies:
     "@ethersproject/abi" "^5.1.2"
     "@metamask/eth-sig-util" "^4.0.0"
-    "@nomicfoundation/edr" "^0.5.2"
+    "@nomicfoundation/edr" "^0.5.0"
     "@nomicfoundation/ethereumjs-common" "4.0.4"
     "@nomicfoundation/ethereumjs-tx" "5.0.4"
     "@nomicfoundation/ethereumjs-util" "9.0.4"