diff --git a/packages/contract-addresses/addresses/rinkeby.json b/packages/contract-addresses/addresses/rinkeby.json
index 69b1ad77c..4e996a8ae 100644
--- a/packages/contract-addresses/addresses/rinkeby.json
+++ b/packages/contract-addresses/addresses/rinkeby.json
@@ -1,18 +1,18 @@
 {
-    "ACE": "0xb98C7cB7645CfCEDafF9a5E9EA5718331Bc5a4Aa",
-    "AccountRegistryManager": "0xd766BF8d06Ca02A5001b7cfB7d964b9be3714Cfc",
-    "Behaviour20200106": "0x0888dCF973A77B423A09739dceb34148c46aa782",
-    "Behaviour20200207": "0xFcF7bdA37004530a144470d9be179fDaBd11C0b1",
-    "Behaviour20200220": "0x8684336E03C3AA2F7072E59c06CA41576348e466",
-    "Dividend": "0xFcab88B20a7E9D67601A083D222138DDf0dbC51B",
-    "ERC20Mintable": "0x16C1a492CA28cA10f72968D7f8F47C4a6b6B68B6",
-    "FactoryAdjustable201907": "0x064c382Fa060294619365cDad8ffd785E1C82976",
-    "FactoryBase201907": "0x967019E1183237e1B4D421b170ad4450CA75B57E",
-    "JoinSplit": "0xA825Ae211505e30cF1FD93B07A627eF8a327B3aA",
-    "JoinSplitFluid": "0x887d07F4c4B981CA1C8A336792C184Cc64cd9421",
-    "PrivateRange": "0x302BF5DC333691a44B65c9d967013a685Cd6CB08",
-    "PublicRange": "0x7816B24213Cf685287f7f0e4e0c9154dd9c6d7Fa",
-    "Swap": "0xeB7b4Ac69d281B8f60b78AD6665813E5aF7bF7a8",
-    "ZkAsset": "0x14849DC5CBabb61C9E75Ef28F7b23FA177Ae6615",
-    "ZkAssetAdjustable": "0xC0538408F149EF74f352F278a85561996C12aCF3"
+    "ACE": "0x6f143F72f1214ade68d2edC7aC8fE876C8f86B7C",
+    "AccountRegistryManager": "0x39Ec96aC2F807fe8293d9d080AbeDB420E946837",
+    "Behaviour20200106": "0x699BDCc8BE7ea87B766DF02C68B84E2A9A3a6078",
+    "Behaviour20200207": "0x27CA0ff421087eAa61d1aBfEEe32Fd90748912e9",
+    "Behaviour20200220": "0xE81b3CBcEE6d8F94d392546f3FB257A72253C9d9",
+    "Dividend": "0xf4AdF56FcBE2cBCF213f4725DfC7B0F67E41Deff",
+    "ERC20Mintable": "0xb614859d00eA57CCc9Fb91a94fC69bCEDE7af4E5",
+    "FactoryAdjustable201907": "0x273cE6d072F72047C9434A406543913cA51a8Df1",
+    "FactoryBase201907": "0xF8df36d195184e211b3b69091DD8A28fad315D37",
+    "JoinSplit": "0xAF4c2040D3c5602dEb15875a6D35d110c7C81540",
+    "JoinSplitFluid": "0x3f83Da7Eb03AEd3EB341DF658069d7E1B42E98C6",
+    "PrivateRange": "0x7d33e38D9D35ca6601670eA3cBF8d1c77be1eAE1",
+    "PublicRange": "0xf65c3C42eCE1B61820751ECD1Cd7a30C2908c1E6",
+    "Swap": "0xb89038f4B27650DF23b716A3613046778caAfEcA",
+    "ZkAsset": "0xa662dc869be8A94e52700F0805b0a585a0476994",
+    "ZkAssetAdjustable": "0x201d6461C336B52DBF1ea8aE502C20c71221c1e9"
 }
\ No newline at end of file
diff --git a/packages/contract-addresses/addresses/ropsten.json b/packages/contract-addresses/addresses/ropsten.json
index 91ceeeca1..c6d4034ef 100644
--- a/packages/contract-addresses/addresses/ropsten.json
+++ b/packages/contract-addresses/addresses/ropsten.json
@@ -1,18 +1,18 @@
 {
-    "ACE": "0x2Fd0FEA4243aB70D8Ade01b3b677bAcAA80F2f35",
-    "AccountRegistryManager": "0x83e6105e09632BAA5E038033FE06211D8a5AEc94",
-    "Behaviour20200106": "0x8f53Dde7C8cE80a2529033C095A65ef59Fcd42e5",
-    "Behaviour20200207": "0xf00Bee364f5bBAD91ec735dc02EdC31cDb35284f",
-    "Behaviour20200220": "0x1CC265A1F94fD60FFbbD6a6497a30e3dDD4Be5d0",
-    "Dividend": "0x3dd4F6B8955a72421Ca08Bb46D2AB9d2Eb244c42",
-    "ERC20Mintable": "0x75E69868837D1bFAc654F89b30Dff6946C899706",
-    "FactoryAdjustable201907": "0x8d3c7d3611fb6Ca731Cb7A7EFc7362E64F38De7f",
-    "FactoryBase201907": "0x7c07509545f32Ac1982DD09e96B19C27fFe9A728",
-    "JoinSplit": "0xe7B28A047cFE993866A94625F3E482786aF75A38",
-    "JoinSplitFluid": "0x1A7E1f2433bcB10b0d2acB3bd5cB3cF2c89e2BB8",
-    "PrivateRange": "0xa2c88458Df1B3F54343C3C7b5e138f6058b58992",
-    "PublicRange": "0x23Fa0457B821812d1C7463326Ccc753e826A898F",
-    "Swap": "0x8A74b99da7441Ba2F00E512De977d1277ff9FD8c",
-    "ZkAsset": "0xc855A115de445550aDDB062caCbdD0A29a5B0F7b",
-    "ZkAssetAdjustable": "0xd967816cdd51d87D4B09B02644541B7D462A2348"
+    "ACE": "0x5011bBca2aE03cD90b40870bfd81c8195Ed32AB9",
+    "AccountRegistryManager": "0x959322d86a09bd761EFa28F862D1cF8CB5def3E9",
+    "Behaviour20200106": "0x9D3f5e0428fC36CDA420409C7166960329481604",
+    "Behaviour20200207": "0x2315Aeb5c7d2D0b74967500943Bf79bE56e2E3C0",
+    "Behaviour20200220": "0x248dB4427Ece66631b96B943c51D77cE694016b8",
+    "Dividend": "0x57cd42984cdD13a1ca757a3093120Df1938b2265",
+    "ERC20Mintable": "0x52408E12bCCAB58e686f885D8DE8910CFA1AF2D0",
+    "FactoryAdjustable201907": "0x8290a85f6281c69Fb8793c6535191AB93D0ae3FD",
+    "FactoryBase201907": "0xE444884ac7023B73ACDd45a5d4302A52954eD213",
+    "JoinSplit": "0xAdf1e534B6F7E5Ea0F660eB9382F79Ad4485618a",
+    "JoinSplitFluid": "0x032100200C3b0ED5b800D6A1669f263E79206642",
+    "PrivateRange": "0x0deeCA84f79dADe0aBF9EFA3386e990e8bB29dDD",
+    "PublicRange": "0x1aCF3eD0cD632B0f3afAB71d9Cb851F9b387dFa6",
+    "Swap": "0xB821A641f34407e9848Bba0a07D049267De7021A",
+    "ZkAsset": "0x755717ed691d5b745f2E5b1264aE3e90890Bb543",
+    "ZkAssetAdjustable": "0xAcfE0191f483C23192C4eAcb8E16b4bd159B0A7d"
 }
\ No newline at end of file