diff --git a/.vscode/settings.json b/.vscode/settings.json
index 671a3e40e..c6e05382a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,8 @@
   "prettier.bracketSpacing": true,
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }
diff --git a/DEPLOYMENT_CHECKLIST.md b/DEPLOYMENT_CHECKLIST.md
index f0ae67ba3..6e1b508ee 100644
--- a/DEPLOYMENT_CHECKLIST.md
+++ b/DEPLOYMENT_CHECKLIST.md
@@ -68,8 +68,9 @@ To deploy run `yarn deploy --network NETWORK` in `packages/contracts` and replac
 
 ### Packages
 
-- [ ] Publish a new version of `@aragon/osx` (`./packages/contracts`) to NPM
-- [ ] Publish a new version of `@aragon/osx-ethers` (`./packages/contracts`) to NPM
+- [ ] Publish a new version of `@aragon/osx-artifacts` (`./packages/contracts`) to NPM
+- [ ] Publish a new version of `@aragon/osx-contracts` (`./packages/contracts/src`) to NPM
+- [ ] Publish a new version of `@aragon/osx-ethers` (`./packages/contracts-ethers`) to NPM
 
 ### Subgraph
 
diff --git a/active_contracts.json b/active_contracts.json
index d6f409fa8..f5c6a189d 100644
--- a/active_contracts.json
+++ b/active_contracts.json
@@ -1,25 +1,48 @@
 {
   "goerli": {
-    "managingDAOImplemenation": "0xF37d853fF9a8B4396fE4CcCc8C9DE744Ea3E7278",
-    "managingDAO": "0xE0f01b08002c202A8Ecba7b57A8CCEe428bd3a98",
-    "DAO_ENSSubdomainRegistrar_Implementation": "0xA5dF309eE52BFdC31f863Bc7492182EbD307A7F0",
-    "DAO_ENSSubdomainRegistrar": "0xcfF83b5fA46574fBc58f771787640a4cc76b329f",
-    "Plugin_ENSSubdomainRegistrar_Implementation": "0x1a4A64EF798e57B983441C99a7d724aa2ECB89f1",
-    "Plugin_ENSSubdomainRegistrar": "0x6cc757A3135BF6e5640037CFa357C93023C0d943",
-    "DAORegistry_Implementation": "0x82fc9F75E2FDdCBdAEA3d45292d95F297499f60a",
-    "DAORegistry": "0xC76852A44a823EBe6b8177aE18CeB6AB60EE0Ac7",
-    "PluginRepoRegistry_Implementation": "0x293928C19CCef3474312B3329fEe3D31fE98a50e",
-    "PluginRepoRegistry": "0x18b8d69F286EE46EFf8FAB9A2707e8F6D4f6cDFe",
-    "PluginRepoFactory": "0x9A0D37169de540149D76eE9bc744992be5399e06",
-    "PluginSetupProcessor": "0x5486F9c5F593f61344047CC696BD73E5a41F657A",
-    "DAOFactory": "0x001407A020bE25589f70F1D4D668BFeA1C69eb9C",
-    "AddresslistVotingSetup": "0xD14EC1877d1d380A01FF8489883B22C42e6973f2",
-    "TokenVotingSetup": "0xe8663E96b6c26bC6BeF2F9FeC6875f2E085519f0",
-    "AdminSetup": "0x3dA186E83892D7C236DbF2BE58bEeA5b29ce6878",
-    "MultisigSetup": "0x5E993db91Fd2c713Df1110358396EAc60d54fE66",
-    "address-list-voting-repo": "0xAbcf728903C84Abad57320fd78A7bb21ae07A261",
-    "token-voting-repo": "0xb60Fd6C478541eE150DE7aE7bd379612b2626234",
-    "admin-repo": "0xe6eEca8428b36ab2e5a96D3F8A903f3c3F8c6938",
-    "multisig-repo": "0x160b35934f24B1b7eE238d37Ca2F495AB1a5a803"
+    "managingDAOImplemenation": "0x99C83C89C59166f7f766A221D5D0Ee00D37170c3",
+    "managingDAO": "0xB76F8d3512497040a96E77141c951a5374F24Eb9",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c",
+    "DAO_ENSSubdomainRegistrar": "0xC62820f3E74cC82F89100032Ad7F04682F9EdaE0",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0xbcE9b6fE957464aF2B739337bd1a936EbFCB5B48",
+    "Plugin_ENSSubdomainRegistrar": "0xd5656b6d1bc0354073f62AAbc1430530C331979c",
+    "DAORegistry_Implementation": "0xa796AC80af77a52AdA92778d8fb6133792480B77",
+    "DAORegistry": "0xd51ac19130A73455F8B3b1c26aFea21D6bA88E54",
+    "PluginRepoRegistry_Implementation": "0x3861Ef32c1bFcdd53E9AaE4af1C9f47390c17fBf",
+    "PluginRepoRegistry": "0x970Eb7Dd57c9F0dc4c5a10c06653d1103946b508",
+    "PluginRepoFactory": "0x301868712b77744A3C0E5511609238399f0A2d4d",
+    "PluginSetupProcessor": "0xE8B5d8D66a02CD1b9Bd32a4064D7ABa45F51305e",
+    "DAOFactory": "0x16B6c6674fEf5d29C9a49EA68A19944f5a8471D3",
+    "AddresslistVotingSetup": "0x4980e5B4394B326c069A54C9ED0Dee2659227352",
+    "TokenVotingSetup": "0x64B336524ea859ed2133c93e4B18be17f44692eE",
+    "AdminSetup": "0x633845bB511DE83EA31b8717614d88fa7b569694",
+    "MultisigSetup": "0xBFd84852C8007Bf148721d2c20F69456F193b201",
+    "address-list-voting-repo": "0xbD293e27226EF2b85E84FADCF2d5135AbC52e50A",
+    "token-voting-repo": "0xFCc843C48BD44e5dA5976a2f2d85772D59C5959E",
+    "admin-repo": "0xF66348E9865bb0f29B889E7c0FE1BCf4acAb5f54",
+    "multisig-repo": "0x92C090cffC592B1bC321aCfAF735057B876375F8"
+  },
+  "mainnet": {
+    "managingDAOImplemenation": "0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8",
+    "managingDAO": "0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA",
+    "DAO_ENSSubdomainRegistrar_Implementation": "0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3",
+    "DAO_ENSSubdomainRegistrar": "0xE640Da5AD169630555A86D9b6b9C145B4961b1EB",
+    "Plugin_ENSSubdomainRegistrar_Implementation": "0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57",
+    "Plugin_ENSSubdomainRegistrar": "0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee",
+    "DAORegistry_Implementation": "0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f",
+    "DAORegistry": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
+    "PluginRepoRegistry_Implementation": "0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF",
+    "PluginRepoRegistry": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
+    "PluginRepoFactory": "0x96E54098317631641703404C06A5afAD89da7373",
+    "PluginSetupProcessor": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
+    "DAOFactory": "0xA03C2182af8eC460D498108C92E8638a580b94d4",
+    "AddresslistVotingSetup": "0x360586dB62DA31327B2462BA27bEb3e48ebbf396",
+    "TokenVotingSetup": "0xB2A2b32b9d885C85d5b229C0509341c37CaE7483",
+    "AdminSetup": "0xBFD541bc4fcE14adf1Fb9258574D3cBF5f55a894",
+    "MultisigSetup": "0x8d6726Fe85Caa585d88FD8342ebEEE88d703E754",
+    "address-list-voting-repo": "0xC207767d8A7a28019AFFAEAe6698F84B5526EbD7",
+    "token-voting-repo": "0xb7401cD221ceAFC54093168B814Cc3d42579287f",
+    "admin-repo": "0xA4371a239D08bfBA6E8894eccf8466C6323A52C3",
+    "multisig-repo": "0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/contracts-ethers/package.json b/packages/contracts-ethers/package.json
index 205d133aa..32dcbde5c 100644
--- a/packages/contracts-ethers/package.json
+++ b/packages/contracts-ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aragon/osx-ethers",
-  "version": "0.8.0-alpha",
+  "version": "1.0.0",
   "description": "The Aragon OSx contract definitions for ethers.js",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",
diff --git a/packages/contracts/Releases.md b/packages/contracts/Releases.md
index 72046a0cd..eb78dfc14 100644
--- a/packages/contracts/Releases.md
+++ b/packages/contracts/Releases.md
@@ -1,7 +1,55 @@
 # Contract Releases
 
+Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)
+Network: mainnet
+managingDAOImplemenation: 0x005098056a837c2c4F99C7eCeE976F8D90bdFFF8
+managingDAO: 0xf2d594F3C93C19D7B1a6F15B5489FFcE4B01f7dA
+DAO_ENSSubdomainRegistrar_Implementation: 0xCe0B4124dea6105bfB85fB4461c4D39f360E9ef3
+DAO_ENSSubdomainRegistrar: 0xE640Da5AD169630555A86D9b6b9C145B4961b1EB
+Plugin_ENSSubdomainRegistrar_Implementation: 0x08633901DdF9cD8e2DC3a073594d0A7DaD6f3f57
+Plugin_ENSSubdomainRegistrar: 0x35B62715459cB60bf6dC17fF8cfe138EA305E7Ee
+DAORegistry_Implementation: 0xC24188a73dc09aA7C721f96Ad8857B469C01dC9f
+DAORegistry: 0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e
+PluginRepoRegistry_Implementation: 0xddCc39a2a0047Eb47EdF94180452cbaB14d426EF
+PluginRepoRegistry: 0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f
+PluginRepoFactory: 0x96E54098317631641703404C06A5afAD89da7373
+PluginSetupProcessor: 0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f
+DAOFactory: 0xA03C2182af8eC460D498108C92E8638a580b94d4
+AddresslistVotingSetup: 0x360586dB62DA31327B2462BA27bEb3e48ebbf396
+TokenVotingSetup: 0xB2A2b32b9d885C85d5b229C0509341c37CaE7483
+AdminSetup: 0xBFD541bc4fcE14adf1Fb9258574D3cBF5f55a894
+MultisigSetup: 0x8d6726Fe85Caa585d88FD8342ebEEE88d703E754
+address-list-voting-repo: 0xC207767d8A7a28019AFFAEAe6698F84B5526EbD7
+token-voting-repo: 0xb7401cD221ceAFC54093168B814Cc3d42579287f
+admin-repo: 0xA4371a239D08bfBA6E8894eccf8466C6323A52C3
+multisig-repo: 0x8c278e37D0817210E18A7958524b7D0a1fAA6F7b
+
+Commit: [cb0621dc5185a73240a6ca33fccc7698f059fdf5](https://github.com/aragon/osx/commit/cb0621dc5185a73240a6ca33fccc7698f059fdf5)
+Network: goerli
+managingDAOImplemenation: 0x99C83C89C59166f7f766A221D5D0Ee00D37170c3
+managingDAO: 0xB76F8d3512497040a96E77141c951a5374F24Eb9
+DAO_ENSSubdomainRegistrar_Implementation: 0x394B49Cc32Dc81B8EaCdeb62A6Fa66F31D1D022c
+DAO_ENSSubdomainRegistrar: 0xC62820f3E74cC82F89100032Ad7F04682F9EdaE0
+Plugin_ENSSubdomainRegistrar_Implementation: 0xbcE9b6fE957464aF2B739337bd1a936EbFCB5B48
+Plugin_ENSSubdomainRegistrar: 0xd5656b6d1bc0354073f62AAbc1430530C331979c
+DAORegistry_Implementation: 0xa796AC80af77a52AdA92778d8fb6133792480B77
+DAORegistry: 0xd51ac19130A73455F8B3b1c26aFea21D6bA88E54
+PluginRepoRegistry_Implementation: 0x3861Ef32c1bFcdd53E9AaE4af1C9f47390c17fBf
+PluginRepoRegistry: 0x970Eb7Dd57c9F0dc4c5a10c06653d1103946b508
+PluginRepoFactory: 0x301868712b77744A3C0E5511609238399f0A2d4d
+PluginSetupProcessor: 0xE8B5d8D66a02CD1b9Bd32a4064D7ABa45F51305e
+DAOFactory: 0x16B6c6674fEf5d29C9a49EA68A19944f5a8471D3
+AddresslistVotingSetup: 0x4980e5B4394B326c069A54C9ED0Dee2659227352
+TokenVotingSetup: 0x64B336524ea859ed2133c93e4B18be17f44692eE
+AdminSetup: 0x633845bB511DE83EA31b8717614d88fa7b569694
+MultisigSetup: 0xBFd84852C8007Bf148721d2c20F69456F193b201
+address-list-voting-repo: 0xbD293e27226EF2b85E84FADCF2d5135AbC52e50A
+token-voting-repo: 0xFCc843C48BD44e5dA5976a2f2d85772D59C5959E
+admin-repo: 0xF66348E9865bb0f29B889E7c0FE1BCf4acAb5f54
+multisig-repo: 0x92C090cffC592B1bC321aCfAF735057B876375F8
+
 Commit: [f8aee0a0fa7ae5825130b9726a18ef6e36ddc121](https://github.com/aragon/osx/commit/f8aee0a0fa7ae5825130b9726a18ef6e36ddc121)
-Network: goeli
+Network: goerli
 managingDAOImplemenation: 0xF37d853fF9a8B4396fE4CcCc8C9DE744Ea3E7278
 managingDAO: 0xE0f01b08002c202A8Ecba7b57A8CCEe428bd3a98
 DAO_ENSSubdomainRegistrar_Implementation: 0xA5dF309eE52BFdC31f863Bc7492182EbD307A7F0
@@ -25,7 +73,7 @@ admin-repo: 0xe6eEca8428b36ab2e5a96D3F8A903f3c3F8c6938
 multisig-repo: 0x160b35934f24B1b7eE238d37Ca2F495AB1a5a803
 
 Commit: [da1278afd8263f7cc13973853bd3b58a352a1ec8](https://github.com/aragon/osx/commit/da1278afd8263f7cc13973853bd3b58a352a1ec8)
-Network: goeli
+Network: goerli
 managingDAOImplemenation: 0x59f3159E8d0F445F711D4f5a1DeA6899cB048B9b
 managingDAO: 0x5EF485A707ed0437B457F52792bF5645b23ce36d
 DAO_ENSSubdomainRegistrar_Implementation: 0xbF06efe19627fa4D694e362B8eB708D610f98481
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index b9ee2043a..6c509cf35 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@aragon/osx",
-  "version": "0.8.0-alpha",
+  "name": "@aragon/osx-artifacts",
+  "version": "1.0.0",
   "description": "The Aragon OSx Solidity contracts",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",
diff --git a/packages/contracts/src/package.json b/packages/contracts/src/package.json
new file mode 100644
index 000000000..b45702d68
--- /dev/null
+++ b/packages/contracts/src/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@aragon/osx-contracts",
+  "version": "1.0.0",
+  "description": "The Aragon OSx Solidity contracts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/aragon/osx.git"
+  },
+  "author": "",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/aragon/osx/issues"
+  },
+  "homepage": "https://github.com/aragon/osx#readme"
+}
diff --git a/packages/subgraph/manifest/data/goerli.json b/packages/subgraph/manifest/data/goerli.json
index ddc9faa1a..30d4c6a55 100644
--- a/packages/subgraph/manifest/data/goerli.json
+++ b/packages/subgraph/manifest/data/goerli.json
@@ -4,17 +4,17 @@
   "dataSources": {
     "DAORegistry": {
       "name": "DAORegistry",
-      "address": "0xC76852A44a823EBe6b8177aE18CeB6AB60EE0Ac7",
+      "address": "0xd51ac19130A73455F8B3b1c26aFea21D6bA88E54",
       "startBlock": 8548226
     },
     "PluginRepoRegistry": {
       "name": "PluginRepoRegistry",
-      "address": "0x18b8d69F286EE46EFf8FAB9A2707e8F6D4f6cDFe",
+      "address": "0x970Eb7Dd57c9F0dc4c5a10c06653d1103946b508",
       "startBlock": 8548226
     },
     "PluginSetupProcessor": {
       "name": "PluginSetupProcessor",
-      "address": "0x5486F9c5F593f61344047CC696BD73E5a41F657A",
+      "address": "0xE8B5d8D66a02CD1b9Bd32a4064D7ABa45F51305e",
       "startBlock": 8548226
     }
   }
diff --git a/packages/subgraph/manifest/data/mainnet.json b/packages/subgraph/manifest/data/mainnet.json
new file mode 100644
index 000000000..72f369c5f
--- /dev/null
+++ b/packages/subgraph/manifest/data/mainnet.json
@@ -0,0 +1,21 @@
+{
+  "info": "# Do not edit subgraph.yaml,this is a generated file. \n# Instead, edit subgraph.placeholder.yaml and run: yarn manifest",
+  "network": "mainnet",
+  "dataSources": {
+    "DAORegistry": {
+      "name": "DAORegistry",
+      "address": "0x7a62da7B56fB3bfCdF70E900787010Bc4c9Ca42e",
+      "startBlock": 16721812
+    },
+    "PluginRepoRegistry": {
+      "name": "PluginRepoRegistry",
+      "address": "0x5B3B36BdC9470963A2734D6a0d2F6a64C21C159f",
+      "startBlock": 16721812
+    },
+    "PluginSetupProcessor": {
+      "name": "PluginSetupProcessor",
+      "address": "0xE978942c691e43f65c1B7c7F8f1dc8cDF061B13f",
+      "startBlock": 16721812
+    }
+  }
+}
diff --git a/packages/subgraph/scripts/build-manifest.sh b/packages/subgraph/scripts/build-manifest.sh
index 231f0572b..c77b86b0c 100755
--- a/packages/subgraph/scripts/build-manifest.sh
+++ b/packages/subgraph/scripts/build-manifest.sh
@@ -17,7 +17,7 @@ fi
 FILE=$NETWORK_NAME'.json'
 DATA=manifest/data/$FILE
 
-ARAGON_OSX_MODULE=$(node -e 'console.log(require("path").dirname(require.resolve("@aragon/osx/package.json")))')
+ARAGON_OSX_MODULE=$(node -e 'console.log(require("path").dirname(require.resolve("@aragon/osx-artifacts/package.json")))')
 
 echo 'Generating manifest from data file: '$DATA
 cat $DATA