diff --git a/scripts/deploy_addressprovider_and_setup.py b/scripts/deploy_addressprovider_and_setup.py
index 7af754e..2c0533d 100644
--- a/scripts/deploy_addressprovider_and_setup.py
+++ b/scripts/deploy_addressprovider_and_setup.py
@@ -20,7 +20,12 @@
     16: "LLAMMA Factory crvUSD",
     17: "LLAMMA Factory OneWayLending",
     18: "Rate Provider",
-    # TODO: add DAO-related contracts, CRV token per chain, gauge factories, ...
+    19: "CRV Token",
+    20: "Gauge Factory",
+    21: "Ownership Admin",
+    22: "Parameter Admin",
+    23: "Emergency Admin",
+    24: "DAO Vault",  # Holds funds
 }
 
 # These are the addresses that will go into the addressprovider for each chain:
@@ -43,6 +48,10 @@
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
         16: "0xc9332fdcb1c491dcc683bae86fe3cb70360738bc",  # call controllerFactory.amm(id)
         17: "0xeA6876DDE9e3467564acBeE1Ed5bac88783205E0",  # same as (16)
+        19: "0xD533a949740bb3306d119CC777fa900bA034cd52",
+        21: "0x40907540d8a6C65c637785e8f8B742ae6b0b9968",  # CurveDAO Ownership Agent
+        22: "0x4eeb3ba4f221ca16ed4a0cc7254e2e32df948c5f",  # CurveDAO Parameter Agent
+        23: "0x00669DF67E4827FCc0E48A1838a8d5AB79281909",  # CurveDAO Emergency Agent
     },
     "arbitrum": {
         0: "0x445FE580eF8d70FF569aB36e80c647af338db351",
@@ -57,6 +66,12 @@
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
         17: "0xcaEC110C784c9DF37240a8Ce096D352A75922DeA",
+        19: "0x11cDb42B0EB46D95f990BeDD4695A6e3fA034978",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
+        21: "0x452030a5D962d37D97A9D65487663cD5fd9C2B32",
+        22: "0x5ccbB27FB594c5cF6aC0670bbcb360c0072F6839",
+        23: "0x2CB6E1Adf22Af1A38d7C3370441743a123991EC3",
+        24: "0x25877b9413Cc7832A6d142891b50bd53935feF82",
     },
     "optimism": {
         0: "0xC5cfaDA84E902aD92DD40194f0883ad49639b023",
@@ -70,6 +85,12 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        19: "0x0994206dfE8De6Ec6920FF4D779B0d950605Fb53",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
+        21: "0x28c4A1Fa47EEE9226F8dE7D6AF0a41C62Ca98267",
+        22: "0xE7F2B72E94d1c2497150c24EA8D65aFFf1027b9b",
+        23: "0x9fF1ddE4BE9BbD891836863d227248047B3D881b",
+        24: "0xD166EEdf272B860E991d331B71041799379185D5",
     },
     "polygon": {
         0: "0x094d12e5b541784701FD8d65F11fc0598FBC6332",
@@ -84,6 +105,11 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        19: "0x172370d5cd63279efa6d502dab29171933a610af",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
+        21: "0x8cB05bFEd65b522a7cF98d590F1711A9Db43af71",
+        22: "0x3CF7c393519ea55D1E1F2c55a6395be63b1A9F9C",
+        23: "0x9FD6E204e08867170ddE54a8374083fF592eBD3E",
     },
     "base": {
         2: "0xd6681e74eEA20d196c15038C580f721EF2aB6320",
@@ -95,6 +121,12 @@
         13: "0xc9Fe0C63Af9A39402e8a5514f9c43Af0322b665F",
         14: "0x5552b631e2aD801fAa129Aacf4B701071cC9D1f7",
         15: "0xEfadDdE5B43917CcC738AdE6962295A0B343f7CE",
+        19: "0x8Ee73c484A26e0A5df2Ee2a4960B789967dd0415",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
+        21: "0x2c163fe0f079d138b9c04f780d735289344C8B80",
+        22: "0x7Ea4B72f04D8B02994F4EdB171Ce5F56eEdF457F",
+        23: "0x95F0f720CAdDED982E6998b3390E6D3788c2CE5C",
+        24: "0xA4c0eA0fb8eb652e11C8123E589197E18Ca78AA8",
     },
     "fraxtal": {
         2: "0x4f37A9d177470499A2dD084621020b023fcffc1F",
@@ -104,6 +136,8 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0x69522fb5337663d3B4dFB0030b881c1A750Adb4f",
+        19: "0x331B9182088e2A7d6D3Fe4742AbA1fB231aEcc56",
+        20: "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
     },
     "bsc": {
         2: "0x69522fb5337663d3B4dFB0030b881c1A750Adb4f",
@@ -115,6 +149,12 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0x0fE38dCC905eC14F6099a83Ac5C93BF2601300CF",
         15: "0xd6681e74eEA20d196c15038C580f721EF2aB6320",
+        19: "0x8Ee73c484A26e0A5df2Ee2a4960B789967dd0415",
+        20: "0xDb205f215f568ADf21b9573b62566f6d9a40bed6",
+        21: "0xC97E2328c5701572C0DFB199b9f860d6ccD74199",
+        22: "0x618a38a556B66FdDdcB5495Be412Df911D18eA1d",
+        23: "0xC940CE179f1F1bdC1EA1c02A2d0481bfD84C3280",
+        24: "0x44C927BacD65da570cB1F0A2F625367049525022",
     },
     "gnosis": {
         0: "0x55e91365697eb8032f98290601847296ec847210",
@@ -128,6 +168,8 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        19: "0x712b3d230f3c1c19db860d80619288b1f0bdd0bd",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     },
     "fantom": {
         0: "0x0f854EA9F38ceA4B1c2FC79047E9D0134419D5d6",
@@ -141,6 +183,12 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        19: "0x1E4F97b9f9F913c46F1632781732927B9019C68b",
+        20: "0xDb205f215f568ADf21b9573b62566f6d9a40bed6",
+        21: "0xd62Ade30F740de7ef766008258B4b2F574A084F7",
+        22: "0x837814ba42c6f3B39f0A5060168F7027695DDAb1",
+        23: "0x42113C6818ACb87ca3CaFDbBc6a6ae396f1548E6",
+        24: "0x49C8De2D10C9A56DD9A59ab5Ca1216111276394C",
     },
     "avax": {
         0: "0x8474DdbE98F5aA3179B3B3F5942D724aFcdec9f6",
@@ -153,6 +201,11 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        20: "0xDb205f215f568ADf21b9573b62566f6d9a40bed6",
+        21: "0xeD953C2849785A8AEd7bC2ee8cf5fdE776E1Dc07",
+        22: "0x33F9A2F3B85e7D4Ff4f9286a9a8525060100D855",
+        23: "0x1309DB123020F0533aFAfaF11D26286d5871bEB0",
+        24: "0xad422855ac8010f82F08696CA7750EfE061aa6D6",
     },
     "aurora": {
         0: "0x5b5cfe992adac0c9d48e05854b2d91c73a003858",
@@ -185,6 +238,10 @@
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
         14: "0xCA8d0747B5573D69653C3aC22242e6341C36e4b4",
         15: "0xA72C85C258A81761433B4e8da60505Fe3Dd551CC",
+        20: "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
+        21: "0xeC6a886148B38C233B07cc6732142dccaBF1051D",
+        22: "0x6e53131F68a034873b6bFA15502aF094Ef0c5854",
+        23: "0xA177D2bd2BD723878bD95982c0855291953f74C9",
     },
     # No UI:
     "linea": {
@@ -198,6 +255,10 @@
         11: "0x0C9D8c7e486e822C29488Ff51BFf0167B4650953",
         12: "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E",
         13: "0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F",
+        21: "0xfe87a6cdca1eeb90987c6a196a1c5f5c76f5f2b0",
+        22: "0x024d362f7aa162d8591304016fd60a209efc527e",
+        23: "0x4339b53cf7f6eec1a997ceea81165e45c1244429",
+        24: "0x77A214bd4ee3650e5608339BBbE04b09f5546ECF",
     },
     "scroll": {
         4: "0xf3A431008396df8A8b2DF492C913706BDB0874ef",