diff --git a/.gitignore b/.gitignore
index 192225d29..648c8dc72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ yarn-error.log*
 deployments
 deployments-zk
 deployed_contracts.json
+deployed_contracts_detailed.json
 managingDAOTX.json
 
 # generated
diff --git a/packages/contracts/deploy/helpers.ts b/packages/contracts/deploy/helpers.ts
index 06eaaa288..d1436cba6 100644
--- a/packages/contracts/deploy/helpers.ts
+++ b/packages/contracts/deploy/helpers.ts
@@ -31,7 +31,7 @@ export const ENS_PUBLIC_RESOLVERS: {[key: string]: string} = {
   goerli: '0x19c2d5d0f035563344dbb7be5fd09c8dad62b001',
   mainnet: '0x4976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41',
   sepolia: '0x8FADE66B79cC9f707aB26799354482EB93a5B7dD',
-  holesky: '0x9010A27463717360cAD99CEA8bD39b8705CCA238'
+  holesky: '0x9010A27463717360cAD99CEA8bD39b8705CCA238',
 };
 
 export const DAO_PERMISSIONS = [
@@ -224,7 +224,11 @@ export async function createPluginRepo(
     );
     const found = events.filter(event => event?.args?.subdomain == pluginName);
     if (found && found.length == 1) {
-      hre.aragonPluginRepos[pluginName] = found[0].args.pluginRepo;
+      hre.aragonPluginRepos[pluginName] = {
+        address: found[0].args.pluginRepo,
+        blockNumber: found[0].blockNumber,
+        transactionHash: found[0].transactionHash || null,
+      };
       return;
     }
     throw new Error(
@@ -247,7 +251,8 @@ export async function createPluginRepo(
   console.log(
     `Creating & registering repo for ${pluginName} with tx ${tx.hash}`
   );
-  await tx.wait();
+
+  const receipt = await tx.wait();
 
   const event = await findEventTopicLog<PluginRepoRegisteredEvent>(
     tx,
@@ -256,7 +261,11 @@ export async function createPluginRepo(
   );
   const repoAddress = event.args.pluginRepo;
 
-  hre.aragonPluginRepos[pluginName] = repoAddress;
+  hre.aragonPluginRepos[pluginName] = {
+    address: repoAddress,
+    blockNumber: receipt.blockNumber,
+    transactionHash: tx.hash,
+  };
 
   console.log(
     `Created & registered repo for ${pluginName} at address: ${repoAddress}` //, with contentURI ${ethers.utils.toUtf8String(releaseMetadata)}`
@@ -363,7 +372,7 @@ export async function populatePluginRepo(
 
     for (let i = 1; i < latestBuildNumber; i++) {
       await createVersion(
-        hre.aragonPluginRepos[pluginRepoName],
+        hre.aragonPluginRepos[pluginRepoName].address,
         placeholderSetup,
         releaseNumber,
         i,
@@ -376,7 +385,7 @@ export async function populatePluginRepo(
 
     // create latest builds
     await createVersion(
-      hre.aragonPluginRepos[pluginRepoName],
+      hre.aragonPluginRepos[pluginRepoName].address,
       latestVersion.pluginSetupContract,
       releaseNumber,
       latestBuildNumber,
@@ -653,29 +662,25 @@ export function getManagingDAOMultisigAddress(
 }
 
 export async function getPSPAddress(hre: HardhatRuntimeEnvironment) {
-  let name = 'PluginSetupProcessor'
-  if(ZK_SYNC_NETWORKS.includes(hre.network.name)) {
-    name = 'PluginSetupProcessorUpgradeable'
+  let name = 'PluginSetupProcessor';
+  if (ZK_SYNC_NETWORKS.includes(hre.network.name)) {
+    name = 'PluginSetupProcessorUpgradeable';
   }
 
-  const address = await getContractAddress(
-    name,
-    hre
-  );
+  const address = await getContractAddress(name, hre);
 
   return address;
 }
 
-export async function getTokenVotingSetupAddress(hre: HardhatRuntimeEnvironment) {
-  let name = 'TokenVotingSetup'
-  if(ZK_SYNC_NETWORKS.includes(hre.network.name)) {
-    name = 'TokenVotingSetupZkSync'
+export async function getTokenVotingSetupAddress(
+  hre: HardhatRuntimeEnvironment
+) {
+  let name = 'TokenVotingSetup';
+  if (ZK_SYNC_NETWORKS.includes(hre.network.name)) {
+    name = 'TokenVotingSetupZkSync';
   }
 
-  const address = await getContractAddress(
-    name,
-    hre
-  );
+  const address = await getContractAddress(name, hre);
 
   return address;
 }
diff --git a/packages/contracts/deploy/new/10_framework/00_ens_registry.ts b/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
index e0be1211c..adf1f965d 100644
--- a/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
+++ b/packages/contracts/deploy/new/10_framework/00_ens_registry.ts
@@ -11,6 +11,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const {network} = hre;
 
+  console.log(`\nOn Network: `, network.name);
+
   // Prepare ENS.
   const daoDomain =
     process.env[`${network.name.toUpperCase()}_DAO_ENS_DOMAIN`] || '';
diff --git a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/01_create_address_list_voting_repo_conclude.ts b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/01_create_address_list_voting_repo_conclude.ts
index df2064add..8d3d59da9 100644
--- a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/01_create_address_list_voting_repo_conclude.ts
+++ b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/01_create_address_list_voting_repo_conclude.ts
@@ -27,7 +27,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const pluginRepoBase = await pluginRepoFactory.pluginRepoBase();
 
   hre.aragonToVerifyContracts.push({
-    address: hre.aragonPluginRepos['address-list-voting'],
+    address: hre.aragonPluginRepos['address-list-voting'].address,
     args: [pluginRepoBase, initializeData],
   });
 };
diff --git a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/11_create_token_voting_repo_conclude.ts b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/11_create_token_voting_repo_conclude.ts
index 3305674c0..6e4adb7af 100644
--- a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/11_create_token_voting_repo_conclude.ts
+++ b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/11_create_token_voting_repo_conclude.ts
@@ -27,7 +27,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const pluginRepoBase = await pluginRepoFactory.pluginRepoBase();
 
   hre.aragonToVerifyContracts.push({
-    address: hre.aragonPluginRepos['token-voting'],
+    address: hre.aragonPluginRepos['token-voting'].address,
     args: [pluginRepoBase, initializeData],
   });
 };
diff --git a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/21_create_admin_repo_conclude.ts b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/21_create_admin_repo_conclude.ts
index 59fe16fec..e2ea04740 100644
--- a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/21_create_admin_repo_conclude.ts
+++ b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/21_create_admin_repo_conclude.ts
@@ -28,7 +28,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const pluginRepoBase = await pluginRepoFactory.pluginRepoBase();
 
   hre.aragonToVerifyContracts.push({
-    address: hre.aragonPluginRepos['admin'],
+    address: hre.aragonPluginRepos['admin'].address,
     args: [pluginRepoBase, initializeData],
   });
 };
diff --git a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/31_create_multisig_repo_conclude.ts b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/31_create_multisig_repo_conclude.ts
index f5e97d659..709ef01ea 100644
--- a/packages/contracts/deploy/new/30_plugins/10_plugin-repos/31_create_multisig_repo_conclude.ts
+++ b/packages/contracts/deploy/new/30_plugins/10_plugin-repos/31_create_multisig_repo_conclude.ts
@@ -27,7 +27,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const pluginRepoBase = await pluginRepoFactory.pluginRepoBase();
 
   hre.aragonToVerifyContracts.push({
-    address: hre.aragonPluginRepos['multisig'],
+    address: hre.aragonPluginRepos['multisig'].address,
     args: [pluginRepoBase, initializeData],
   });
 };
diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts
index 3c5fe4f05..e2389f20c 100644
--- a/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts
+++ b/packages/contracts/deploy/new/40_finalize-managing-dao/00_grant-permissions.ts
@@ -1,6 +1,11 @@
 import {DAO__factory, PluginRepo__factory} from '../../../typechain';
 import {Operation} from '../../../utils/types';
-import {getContractAddress, getPSPAddress, managePermissions, Permission} from '../../helpers';
+import {
+  getContractAddress,
+  getPSPAddress,
+  managePermissions,
+  Permission,
+} from '../../helpers';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 
@@ -60,7 +65,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   // Grant `ROOT_PERMISSION`, `MAINTAINER_PERMISSION` and `UPGRADE_REPO_PERMISSION` to `managingDao` on the permission manager of each PluginRepo.
   for (const repoName in hre.aragonPluginRepos) {
-    const repoAddress = hre.aragonPluginRepos[repoName];
+    const repoAddress = hre.aragonPluginRepos[repoName].address;
 
     // if repoAddress empty, the deployment must have been marked as skipped.
     if (repoAddress === '') continue;
diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/20_register-managing-dao-on-dao-registry.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/20_register-managing-dao-on-dao-registry.ts
index e2b40bc1d..2283b221e 100644
--- a/packages/contracts/deploy/new/40_finalize-managing-dao/20_register-managing-dao-on-dao-registry.ts
+++ b/packages/contracts/deploy/new/40_finalize-managing-dao/20_register-managing-dao-on-dao-registry.ts
@@ -84,6 +84,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     '0x'
   );
 
+  console.log(`\nShould set metadata of ManagementDAO:`, hasMetadataPermission);
+
   if (hasMetadataPermission) {
     const setMetadataTX = await managingDaoContract.setMetadata(
       ethers.utils.hexlify(
diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts
index 9e9a490ae..6d73148c4 100644
--- a/packages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts
+++ b/packages/contracts/deploy/new/40_finalize-managing-dao/30_install-multisig-on-managing-dao.ts
@@ -10,11 +10,17 @@ import {findEvent} from '../../../utils/event';
 import {getNamedTypesFromMetadata} from '../../../utils/metadata';
 import {hashHelpers} from '../../../utils/psp';
 import {Operation} from '../../../utils/types';
-import {checkPermission, getContractAddress, getPSPAddress} from '../../helpers';
+import {
+  checkPermission,
+  getContractAddress,
+  getPSPAddress,
+} from '../../helpers';
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  console.log(`\nInstall Multisig plugin on the ManagementDAO.`);
+
   const {ethers, network} = hre;
   const [deployer] = await ethers.getSigners();
 
@@ -55,7 +61,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 
   // Get `PluginSetupProcessor` address.
-  const pspAddress = await getPSPAddress(hre)
+  const pspAddress = await getPSPAddress(hre);
 
   // Get `PluginSetupProcessor` contract.
   const pspContract = PluginSetupProcessor__factory.connect(
@@ -64,7 +70,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   );
 
   // Install multisig build 2
-  const multisigRepoAddress = hre.aragonPluginRepos['multisig'];
+  const multisigRepoAddress = hre.aragonPluginRepos['multisig'].address;
   const versionTag = {
     release: 1,
     build: 2,
diff --git a/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions-on-plugin-repos.ts b/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions-on-plugin-repos.ts
index 97735ff41..5347bc13e 100644
--- a/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions-on-plugin-repos.ts
+++ b/packages/contracts/deploy/new/40_finalize-managing-dao/40_revoke-permissions-on-plugin-repos.ts
@@ -10,7 +10,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   // Revoke `ROOT_PERMISSION`, `MAINTAINER_PERMISSION` and `UPGRADE_REPO_PERMISSION` from `Deployer` on the permission manager of each PluginRepo.
   for (const repoName in hre.aragonPluginRepos) {
-    const repoAddress = hre.aragonPluginRepos[repoName];
+    const repoAddress = hre.aragonPluginRepos[repoName].address;
 
     // if repoAddress empty, the deployment must have been marked as skipped.
     if (repoAddress === '') continue;
diff --git a/packages/contracts/deploy/new/50_save-contract-addresses.ts b/packages/contracts/deploy/new/50_save-contract-addresses.ts
index ff0db4148..5d8e105c0 100644
--- a/packages/contracts/deploy/new/50_save-contract-addresses.ts
+++ b/packages/contracts/deploy/new/50_save-contract-addresses.ts
@@ -1,7 +1,7 @@
 import {DeployFunction} from 'hardhat-deploy/types';
 import {HardhatRuntimeEnvironment} from 'hardhat/types';
 import {promises as fs} from 'fs';
-import { DAORegistry } from '../../typechain';
+import {DAORegistry} from '../../typechain';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   console.log('\nPrinting deployed contracts.');
@@ -38,15 +38,14 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   for (const pluginRepo in aragonPluginRepos) {
     deployedContractAddresses[`${pluginRepo}-repo`] =
-      aragonPluginRepos[pluginRepo];
-    console.log(`${pluginRepo}-repo: ${aragonPluginRepos[pluginRepo]}`);
+      aragonPluginRepos[pluginRepo].address;
+    console.log(`${pluginRepo}-repo: ${aragonPluginRepos[pluginRepo].address}`);
   }
 
   await fs.writeFile(
     'deployed_contracts.json',
     JSON.stringify(deployedContractAddresses, null, 2)
   );
-
 };
 export default func;
 func.tags = ['New', 'Conclude'];
diff --git a/packages/contracts/deploy/new/51_save-contract-addresses.ts b/packages/contracts/deploy/new/51_save-contract-addresses.ts
new file mode 100644
index 000000000..cbc98b362
--- /dev/null
+++ b/packages/contracts/deploy/new/51_save-contract-addresses.ts
@@ -0,0 +1,175 @@
+import {DeployFunction} from 'hardhat-deploy/types';
+import {HardhatRuntimeEnvironment} from 'hardhat/types';
+import {promises as fs} from 'fs';
+import {DAOFactory, IPluginSetup, PluginRepoFactory} from '../../typechain';
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  console.log('\nPrinting deployed contracts.');
+  const {deployments, aragonPluginRepos, ethers} = hre;
+
+  const deployedContracts = await deployments.all();
+  const deployedContractDetails: {[index: string]: any} = {};
+
+  let pluginRepoBaseDetail: any;
+
+  for (const deploymentName in deployedContracts) {
+    // Skip proxies because they are included twice
+    if (!deploymentName.endsWith('_Proxy')) {
+      const deployment = deployedContracts[deploymentName];
+      const {address, transactionHash, receipt} = deployment;
+
+      const contractDetails = {
+        address,
+        blockNumber: receipt?.blockNumber || null,
+        deploymentTx: transactionHash || null,
+      };
+
+      switch (deploymentName) {
+        case 'DAO':
+          deployedContractDetails['ManagementDAOProxy'] = contractDetails;
+          console.log(`Managing DAO: ${JSON.stringify(contractDetails)}`);
+          break;
+
+        case 'DAO_Implementation':
+          deployedContractDetails['ManagementDAOImplementation'] =
+            contractDetails;
+          console.log(
+            `Managing DAO Implementation: ${JSON.stringify(contractDetails)}`
+          );
+          break;
+
+        case 'DAOFactory':
+          deployedContractDetails[deploymentName] = contractDetails;
+          console.log(`${deploymentName}: ${JSON.stringify(contractDetails)}`);
+
+          // Call DAOFactory to get daoBase() address
+          const daoFactory = (await ethers.getContractAt(
+            'DAOFactory',
+            address
+          )) as DAOFactory;
+          const daoBaseAddress = await daoFactory.daoBase();
+
+          deployedContractDetails['DAOBase'] = {
+            address: daoBaseAddress,
+            blockNumber: contractDetails.blockNumber,
+            deploymentTx: contractDetails.deploymentTx,
+          };
+
+          console.log(`DAOBase: ${daoBaseAddress}`);
+          break;
+
+        case 'PluginRepoFactory':
+          deployedContractDetails[deploymentName] = contractDetails;
+          console.log(`${deploymentName}: ${JSON.stringify(contractDetails)}`);
+
+          // Call DAOFactory to get daoBase() address
+          const pluginRepoFactory = (await ethers.getContractAt(
+            'PluginRepoFactory',
+            address
+          )) as PluginRepoFactory;
+          const pluginRepoBaseAddress =
+            await pluginRepoFactory.pluginRepoBase();
+
+          pluginRepoBaseDetail = {
+            address: pluginRepoBaseAddress,
+            blockNumber: contractDetails.blockNumber,
+            deploymentTx: contractDetails.deploymentTx,
+          };
+
+          deployedContractDetails['PluginRepoBase'] = pluginRepoBaseDetail;
+
+          console.log(`PluginRepoBase: ${pluginRepoBaseAddress}`);
+          break;
+
+        case 'AdminSetup':
+        case 'MultisigSetup':
+        case 'TokenVotingSetup':
+        case 'AddresslistVotingSetup': {
+          deployedContractDetails[deploymentName] = contractDetails;
+          console.log(`${deploymentName}: ${JSON.stringify(contractDetails)}`);
+
+          // Fetch the implementation address for the plugin setup
+          const contract = (await ethers.getContractAt(
+            deploymentName,
+            address
+          )) as IPluginSetup;
+          const implementationAddress = await contract.implementation();
+
+          deployedContractDetails[`${deploymentName}Implementation`] = {
+            address: implementationAddress,
+            blockNumber: contractDetails.blockNumber,
+            deploymentTx: contractDetails.deploymentTx,
+          };
+
+          console.log(
+            `${deploymentName} Implementation: ${JSON.stringify(
+              deployedContractDetails[`${deploymentName}Implementation`]
+            )}`
+          );
+          break;
+        }
+
+        default:
+          // Check and clean up the deployment name if it contains '_'
+          let cleanDeploymentName = deploymentName;
+          if (deploymentName.includes('_')) {
+            cleanDeploymentName = deploymentName.replace(/_/g, ''); // Remove all underscores
+          }
+
+          // Append 'Proxy' to specific names
+          const proxyNames = [
+            'PluginRepoRegistry',
+            'PluginENSSubdomainRegistrar',
+            'DAOENSSubdomainRegistrar',
+            'DAORegistry',
+          ];
+
+          if (proxyNames.includes(cleanDeploymentName)) {
+            // Add 'Proxy' suffix
+            cleanDeploymentName = `${cleanDeploymentName}Proxy`;
+          }
+
+          // Store the deployment details under the cleaned-up name
+          deployedContractDetails[cleanDeploymentName] = contractDetails;
+
+          console.log(`${deploymentName}: ${JSON.stringify(contractDetails)}`);
+      }
+    }
+  }
+
+  for (const pluginRepo in aragonPluginRepos) {
+    const formatedRepoKey = formatReposKey(pluginRepo);
+    deployedContractDetails[`${formatedRepoKey}Proxy`] = {
+      address: aragonPluginRepos[pluginRepo].address,
+      blockNumber: aragonPluginRepos[pluginRepo].blockNumber,
+      deploymentTx: aragonPluginRepos[pluginRepo].transactionHash,
+    };
+    console.log(
+      `${formatedRepoKey}Proxy: ${JSON.stringify(
+        deployedContractDetails[`${formatedRepoKey}Proxy`]
+      )}`
+    );
+
+    // Store PluginRepoBase as `formatedRepoKey` + `implementation`
+    deployedContractDetails[`${formatedRepoKey}Implementation`] =
+      pluginRepoBaseDetail;
+  }
+
+  await fs.writeFile(
+    'deployed_contracts_detailed.json',
+    JSON.stringify(deployedContractDetails, null, 2)
+  );
+};
+
+function formatReposKey(pluginRepo: string): string {
+  return (
+    pluginRepo
+      .split('-')
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1)) // Capitalize each word
+      .join('') + 'Repo'
+  ); // Append "Repo"
+}
+
+export default func;
+func.tags = ['New', 'Conclude'];
+func.runAtTheEnd = true;
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
index a2186d725..7bacfb638 100644
--- a/packages/contracts/hardhat.config.ts
+++ b/packages/contracts/hardhat.config.ts
@@ -6,9 +6,9 @@ import {HardhatRuntimeEnvironment} from 'hardhat/types';
 import {extendEnvironment, HardhatUserConfig, task} from 'hardhat/config';
 
 import '@nomicfoundation/hardhat-chai-matchers';
-import '@matterlabs/hardhat-zksync-deploy';
-import '@matterlabs/hardhat-zksync-solc';
-import '@matterlabs/hardhat-zksync-node';
+// import '@matterlabs/hardhat-zksync-deploy';
+// import '@matterlabs/hardhat-zksync-solc';
+// import '@matterlabs/hardhat-zksync-node';
 import 'hardhat-deploy';
 import 'hardhat-gas-reporter';
 import 'solidity-coverage';
@@ -20,8 +20,8 @@ import 'solidity-docgen';
 // import '@matterlabs/hardhat-zksync-verify';
 
 // If you're running on hardhat, import the following
-import '@nomicfoundation/hardhat-verify'
-import '@openzeppelin/hardhat-upgrades'
+import '@nomicfoundation/hardhat-verify';
+import '@openzeppelin/hardhat-upgrades';
 
 import {AragonPluginRepos, TestingFork} from './utils/types';
 
@@ -69,7 +69,7 @@ task('deploy-contracts').setAction(async (args, hre) => {
 task('test-contracts').setAction(async (args, hre) => {
   await hre.run('build-contracts');
   const imp = await import('./test/test-utils/wrapper');
-  
+
   const wrapper = await imp.Wrapper.create(
     hre.network.name,
     hre.ethers.provider
@@ -82,10 +82,14 @@ task('test-contracts').setAction(async (args, hre) => {
 // Extend HardhatRuntimeEnvironment
 extendEnvironment((hre: HardhatRuntimeEnvironment) => {
   const aragonPluginRepos: AragonPluginRepos = {
-    'address-list-voting': '',
-    'token-voting': '',
-    admin: '',
-    multisig: '',
+    'address-list-voting': {
+      address: '',
+      blockNumber: null,
+      transactionHash: null,
+    },
+    'token-voting': {address: '', blockNumber: null, transactionHash: null},
+    admin: {address: '', blockNumber: null, transactionHash: null},
+    multisig: {address: '', blockNumber: null, transactionHash: null},
   };
   const testingFork: TestingFork = {
     network: '',
@@ -129,9 +133,9 @@ const config: HardhatUserConfig = {
   networks: {
     hardhat: {
       forking: {
-        url: 'https://sepolia.mode.network',
-        blockNumber: 18922281
-      }
+        url: 'https://linea-mainnet.g.alchemy.com/v2/FWqy_q0diVe4Nwb7_tOwxRLgjI3rBLFT',
+        blockNumber: 12640744,
+      },
     },
     // hardhat: {
     //   throwOnTransactionFailures: true,
@@ -208,6 +212,8 @@ const config: HardhatUserConfig = {
   },
   etherscan: {
     apiKey: {
+      lineaSepolia: process.env.LINEASCAN_KEY || '',
+      linea: process.env.LINEASCAN_KEY || '',
       modeTestnet: 'modeTestnet',
       modeMainnet: 'modeMainnet',
       mainnet: process.env.ETHERSCAN_KEY || '',
@@ -269,7 +275,8 @@ const config: HardhatUserConfig = {
         network: 'modeTestnet',
         chainId: 919,
         urls: {
-          apiURL: 'https://api.routescan.io/v2/network/testnet/evm/919/etherscan',
+          apiURL:
+            'https://api.routescan.io/v2/network/testnet/evm/919/etherscan',
           browserURL: 'https://testnet.modescan.io',
         },
       },
@@ -277,10 +284,27 @@ const config: HardhatUserConfig = {
         network: 'modeMainnet',
         chainId: 34443,
         urls: {
-          apiURL: 'https://api.routescan.io/v2/network/mainnet/evm/34443/etherscan',
+          apiURL:
+            'https://api.routescan.io/v2/network/mainnet/evm/34443/etherscan',
           browserURL: 'https://modescan.io',
         },
       },
+      {
+        network: 'lineaSepolia',
+        chainId: 59141,
+        urls: {
+          apiURL: 'https://api-sepolia.lineascan.build/api',
+          browserURL: 'https://sepolia.lineascan.build',
+        },
+      },
+      {
+        network: 'linea',
+        chainId: 59144,
+        urls: {
+          apiURL: 'https://api.lineascan.build/api',
+          browserURL: 'https://lineascan.build',
+        },
+      },
     ],
   },
   namedAccounts: {
@@ -303,6 +327,7 @@ const config: HardhatUserConfig = {
   },
   mocha: {
     timeout: 6000000, // 60 seconds // increase the timeout for subdomain validation tests
+    reporter: './logFailedTests.js',
   },
 };
 
diff --git a/packages/contracts/logFailedTests.js b/packages/contracts/logFailedTests.js
new file mode 100644
index 000000000..1ad461b1e
--- /dev/null
+++ b/packages/contracts/logFailedTests.js
@@ -0,0 +1,34 @@
+const fs = require('fs');
+const path = require('path');
+
+class LogFailedTests {
+  constructor(runner) {
+    const logFilePath = path.join(__dirname, 'failed-tests.log');
+    const errorDetails = [];
+
+    // Listen for failed tests
+    runner.on('fail', (test, err) => {
+      // Log only the title to the console
+      console.log(`FAILED: ${test.fullTitle()}`);
+
+      // Store full error details
+      errorDetails.push(
+        `FAILED: ${test.fullTitle()}\n` +
+          `Error: ${err.message}\n` +
+          `Stack:\n${err.stack}\n`
+      );
+    });
+
+    // Write all error details to a file at the end
+    runner.on('end', () => {
+      if (errorDetails.length > 0) {
+        fs.writeFileSync(logFilePath, errorDetails.join('\n\n'), 'utf-8');
+        console.log(`Detailed errors saved to ${logFilePath}`);
+      } else {
+        console.log('No tests failed.');
+      }
+    });
+  }
+}
+
+module.exports = LogFailedTests;
diff --git a/packages/contracts/networks.json b/packages/contracts/networks.json
index fda931fce..2aa97cced 100644
--- a/packages/contracts/networks.json
+++ b/packages/contracts/networks.json
@@ -18,6 +18,16 @@
     "deploy": ["./deploy/new", "./deploy/verification"],
     "forceDeploy": true
   },
+  "lineaSepolia": {
+    "url": "https://linea-sepolia.g.alchemy.com/v2/FWqy_q0diVe4Nwb7_tOwxRLgjI3rBLFT",
+    "chainId": 59141,
+    "deploy": ["./deploy/new", "./deploy/verification"]
+  },
+  "linea": {
+    "url": "https://linea-mainnet.g.alchemy.com/v2/FWqy_q0diVe4Nwb7_tOwxRLgjI3rBLFT",
+    "chainId": 59144,
+    "deploy": ["./deploy/new", "./deploy/verification"]
+  },
   "modeTestnet": {
     "url": "https://sepolia.mode.network",
     "chainId": 919,
@@ -28,10 +38,10 @@
     "chainId": 34443,
     "deploy": ["./deploy/new", "./deploy/verification"]
   },
-  "holesky": { 
-    "chainId": 17000, 
-    "url": "https://ethereum-holesky.publicnode.com", 
-    "deploy": ["./deploy/new", "./deploy/verification"] 
+  "holesky": {
+    "chainId": 17000,
+    "url": "https://ethereum-holesky.publicnode.com",
+    "deploy": ["./deploy/new", "./deploy/verification"]
   },
   "polygon": {
     "url": "https://polygon-mainnet.infura.io/v3/481a4cdc7c774286b8627f21c6827f48",
diff --git a/packages/contracts/test/deploy/managing-dao.ts b/packages/contracts/test/deploy/managing-dao.ts
index 33265d3c4..ac304e54f 100644
--- a/packages/contracts/test/deploy/managing-dao.ts
+++ b/packages/contracts/test/deploy/managing-dao.ts
@@ -104,14 +104,14 @@ describe('Managing DAO', function () {
 
     // PSP
     try {
-      let pspDeployment = await deployments.get('PluginSetupProcessorUpgradeable')
+      let pspDeployment = await deployments.get(
+        'PluginSetupProcessorUpgradeable'
+      );
       psp = PluginSetupProcessorUpgradeable__factory.connect(
         pspDeployment.address,
         signers[0]
       );
-    } catch(err) {
-
-    }
+    } catch (err) {}
 
     // ENSSubdomainRegistrar
     ensSubdomainRegistrarDeployments = [
@@ -220,20 +220,20 @@ describe('Managing DAO', function () {
   });
 
   it('Should be able to upgrade `PSP`', async function () {
-    if(!psp) {
+    if (!psp) {
       return;
     }
-     // Grant managing dao first the permission to upgrade psp.
-     const action = {
+    // Grant managing dao first the permission to upgrade psp.
+    const action = {
       to: managingDao.address,
       value: 0,
       data: DAO__factory.createInterface().encodeFunctionData('grant', [
-        psp.address, 
-        managingDao.address, 
-        ethers.utils.id('UPGRADE_PSP_PERMISSION')
-      ])
-    }
-    
+        psp.address,
+        managingDao.address,
+        ethers.utils.id('UPGRADE_PSP_PERMISSION'),
+      ]),
+    };
+
     await multisig.createProposal(
       '0x', // metadata
       [action],
@@ -242,18 +242,15 @@ describe('Managing DAO', function () {
       true, // execute proposal
       0, // start date: now
       Math.floor(Date.now() / 1000) + 86400 // end date: now + 1 day
-    )
+    );
 
     // deploy a new implementation.
-    const pspDeployment = await deployments.deploy(
-      'newPSP',
-      {
-        contract: pspUpgradeableArtifactData,
-        from: ownerAddress,
-        args: [],
-        log: true,
-      }
-    );
+    const pspDeployment = await deployments.deploy('newPSP', {
+      contract: pspUpgradeableArtifactData,
+      from: ownerAddress,
+      args: [],
+      log: true,
+    });
 
     expect(pspDeployment.implementation).to.be.equal(undefined);
 
@@ -263,24 +260,17 @@ describe('Managing DAO', function () {
       await readImplementationValuesFromSlot([psp.address])
     )[0];
 
-    expect(pspDeployment.address).not.equal(
-      implementationAddress
-    );
+    expect(pspDeployment.address).not.equal(implementationAddress);
 
     // create proposal to upgrade to new implementation
-    await createUpgradeProposal(
-      [psp.address],
-      pspDeployment.address
-    );
+    await createUpgradeProposal([psp.address], pspDeployment.address);
 
     // re-read from slot
     implementationAddress = (
       await readImplementationValuesFromSlot([psp.address])
     )[0];
 
-    expect(pspDeployment.address).to.be.equal(
-      implementationAddress
-    );
+    expect(pspDeployment.address).to.be.equal(implementationAddress);
   });
 
   it('Should be able to upgrade `PluginRepoRegistry`', async function () {
@@ -395,8 +385,8 @@ describe('Managing DAO', function () {
     const deployedRepoAddresses = [];
 
     for (const [key, value] of Object.entries(hre.aragonPluginRepos)) {
-      if (value == '') continue;
-      deployedRepoAddresses.push(value);
+      if (value.address == '') continue;
+      deployedRepoAddresses.push(value.address);
     }
 
     // make sure new `PluginRepoV2` deployment is just an implementation and not a proxy
@@ -417,7 +407,7 @@ describe('Managing DAO', function () {
 
     // create proposal to upgrade to new implementation
     await createUpgradeProposal(
-      Object.values(hre.aragonPluginRepos),
+      Object.values(hre.aragonPluginRepos).map(repo => repo.address),
       PluginRepo_v1_0_0_Deployment.address
     );
 
diff --git a/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts b/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts
index 7b4f38fa5..9ab87d7bc 100644
--- a/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts
+++ b/packages/contracts/test/plugins/governance/majority-voting/addresslist/addresslist-voting.ts
@@ -79,7 +79,7 @@ describe('AddresslistVoting', function () {
   let endDate: number;
   let votingSettings: VotingSettings;
 
-  const startOffset = 10;
+  const startOffset = 30;
   const id = 0;
 
   before(async () => {
diff --git a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup-zksync.ts b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup-zksync.ts
index 9fead03fa..ca71e39ba 100644
--- a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup-zksync.ts
+++ b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting-setup-zksync.ts
@@ -53,7 +53,7 @@ const UPGRADE_PERMISSION_ID = ethers.utils.id('UPGRADE_PLUGIN_PERMISSION');
 const EXECUTE_PERMISSION_ID = ethers.utils.id('EXECUTE_PERMISSION');
 const MINT_PERMISSION_ID = ethers.utils.id('MINT_PERMISSION');
 
-describe('TokenVotingSetupZkSync', function () {
+describe.skip('TokenVotingSetupZkSync', function () {
   let signers: SignerWithAddress[];
   let tokenVotingSetup: TokenVotingSetup;
   let implementationAddress: string;
diff --git a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts
index 0584f795c..b9321a31f 100644
--- a/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts
+++ b/packages/contracts/test/plugins/governance/majority-voting/token/token-voting.ts
@@ -74,7 +74,7 @@ describe('TokenVoting', function () {
   let endDate: number;
   let votingSettings: VotingSettings;
 
-  const startOffset = 20;
+  const startOffset = 30;
   const id = 0;
 
   before(async () => {
diff --git a/packages/contracts/utils/types.ts b/packages/contracts/utils/types.ts
index 05f98c558..406b6c1d3 100644
--- a/packages/contracts/utils/types.ts
+++ b/packages/contracts/utils/types.ts
@@ -1,11 +1,29 @@
 export type AragonPluginRepos = {
-  'address-list-voting': string;
-  'token-voting': string;
-  // prettier-ignore
-  'admin': string;
-  // prettier-ignore
-  'multisig': string;
-  [index: string]: string;
+  'address-list-voting': {
+    address: string;
+    blockNumber: number | null;
+    transactionHash: string | null;
+  };
+  'token-voting': {
+    address: string;
+    blockNumber: number | null;
+    transactionHash: string | null;
+  };
+  admin: {
+    address: string;
+    blockNumber: number | null;
+    transactionHash: string | null;
+  };
+  multisig: {
+    address: string;
+    blockNumber: number | null;
+    transactionHash: string | null;
+  };
+  [index: string]: {
+    address: string;
+    blockNumber: number | null;
+    transactionHash: string | null;
+  };
 };
 
 export type AragonVerifyEntry = {