diff --git a/Cargo.lock b/Cargo.lock
index 4f3d4a8df..ecaed6ba6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -623,7 +623,7 @@ dependencies = [
  "anyhow",
  "cosm-orc",
  "cosmwasm-std",
- "cw-admin-factory 2.5.0",
+ "cw-admin-factory",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw20-stake 2.5.0",
@@ -632,7 +632,7 @@ dependencies = [
  "dao-pre-propose-single 2.5.0",
  "dao-proposal-single 2.5.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "env_logger",
  "serde",
  "serde_json",
@@ -674,27 +674,7 @@ dependencies = [
  "dao-proposal-single 2.5.0",
  "dao-testing",
  "dao-voting 2.5.0",
- "dao-voting-token-staked 2.5.0",
- "osmosis-std-derive",
- "prost 0.12.3",
- "prost-derive 0.12.3",
- "prost-types 0.12.3",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "btsg-ft-factory"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting-token-staked",
  "osmosis-std-derive",
  "prost 0.12.3",
  "prost-derive 0.12.3",
@@ -1186,7 +1166,7 @@ dependencies = [
  "bech32 0.9.1",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-admin-factory 2.5.0",
+ "cw-admin-factory",
  "cw-multi-test",
  "cw-orch 0.24.1",
  "cw-storage-plus 1.2.0",
@@ -1204,20 +1184,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-admin-factory"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-controllers"
 version = "0.11.1"
@@ -1340,17 +1306,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-denom"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw20 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-denom"
 version = "2.5.0"
@@ -1363,17 +1318,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-denom"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw20 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-fund-distributor"
 version = "2.5.0"
@@ -1391,26 +1335,7 @@ dependencies = [
  "cw20-stake 2.5.0",
  "dao-dao-core 2.5.0",
  "dao-interface 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
- "thiserror",
-]
-
-[[package]]
-name = "cw-fund-distributor"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-paginate-storage 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw20-staked 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting-cw20-staked",
  "thiserror",
 ]
 
@@ -1437,17 +1362,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-hooks"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "thiserror",
-]
-
 [[package]]
 name = "cw-hooks"
 version = "2.5.0"
@@ -1458,17 +1372,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-hooks"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "thiserror",
-]
-
 [[package]]
 name = "cw-multi-test"
 version = "0.20.1"
@@ -1754,16 +1657,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cw-paginate-storage"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "serde",
-]
-
 [[package]]
 name = "cw-payroll-factory"
 version = "2.5.0"
@@ -1776,7 +1669,7 @@ dependencies = [
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
- "cw-vesting 2.5.0",
+ "cw-vesting",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
@@ -1784,24 +1677,6 @@ dependencies = [
  "wynd-utils",
 ]
 
-[[package]]
-name = "cw-payroll-factory"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw-vesting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-proposal-single"
 version = "0.1.0"
@@ -1833,17 +1708,7 @@ version = "2.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-wormhole 2.5.0",
-]
-
-[[package]]
-name = "cw-stake-tracker"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-wormhole 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "cw-wormhole",
 ]
 
 [[package]]
@@ -1906,21 +1771,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-token-swap"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "thiserror",
-]
-
 [[package]]
 name = "cw-tokenfactory-issuer"
 version = "2.5.0"
@@ -1931,7 +1781,7 @@ dependencies = [
  "cw-orch 0.24.1",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
- "cw-tokenfactory-types 2.5.0",
+ "cw-tokenfactory-types",
  "cw2 1.1.2",
  "dao-interface 2.5.0",
  "osmosis-std",
@@ -1944,27 +1794,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw-tokenfactory-issuer"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-tokenfactory-types 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "osmosis-std",
- "prost 0.12.3",
- "prost-derive 0.12.3",
- "schemars",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "cw-tokenfactory-types"
 version = "2.5.0"
@@ -1982,24 +1811,6 @@ dependencies = [
  "serde-cw-value",
 ]
 
-[[package]]
-name = "cw-tokenfactory-types"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "osmosis-std",
- "osmosis-std-derive",
- "prost 0.12.3",
- "prost-derive 0.12.3",
- "prost-types 0.12.3",
- "schemars",
- "serde",
- "serde-cw-value",
-]
-
 [[package]]
 name = "cw-utils"
 version = "0.11.1"
@@ -2065,10 +1876,10 @@ dependencies = [
  "cw-multi-test",
  "cw-orch 0.24.1",
  "cw-ownable",
- "cw-stake-tracker 2.5.0",
+ "cw-stake-tracker",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
- "cw-wormhole 2.5.0",
+ "cw-wormhole",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
@@ -2078,27 +1889,6 @@ dependencies = [
  "wynd-utils",
 ]
 
-[[package]]
-name = "cw-vesting"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-stake-tracker 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw-wormhole 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "serde",
- "thiserror",
- "wynd-utils",
-]
-
 [[package]]
 name = "cw-wormhole"
 version = "2.5.0"
@@ -2109,17 +1899,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cw-wormhole"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "serde",
-]
-
 [[package]]
 name = "cw2"
 version = "0.11.1"
@@ -2334,30 +2113,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw20-stake"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-paginate-storage 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw-utils 0.13.4",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw20-stake 0.2.6",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "cw20-stake-external-rewards"
 version = "2.5.0"
@@ -2381,28 +2136,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw20-stake-external-rewards"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 0.13.4",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "stake-cw20-external-rewards",
- "thiserror",
-]
-
 [[package]]
 name = "cw20-stake-reward-distributor"
 version = "2.5.0"
@@ -2422,25 +2155,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw20-stake-reward-distributor"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "stake-cw20-reward-distributor",
- "thiserror",
-]
-
 [[package]]
 name = "cw20-staked-balance-voting"
 version = "0.1.0"
@@ -2638,18 +2352,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cw721-controllers"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "thiserror",
-]
-
 [[package]]
 name = "cw721-roles"
 version = "2.5.0"
@@ -2666,30 +2368,9 @@ dependencies = [
  "cw4 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "dao-cw721-extensions 2.5.0",
+ "dao-cw721-extensions",
  "dao-testing",
- "dao-voting-cw721-staked 2.5.0",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw721-roles"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw4 1.1.2",
- "cw721 0.18.0",
- "cw721-base 0.18.0",
- "dao-cw721-extensions 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting-cw721-staked",
  "serde",
  "thiserror",
 ]
@@ -2698,82 +2379,40 @@ dependencies = [
 name = "dao-cw-orch"
 version = "2.5.0"
 dependencies = [
- "btsg-ft-factory 2.5.0",
+ "btsg-ft-factory",
  "cosmwasm-std",
- "cw-admin-factory 2.5.0",
- "cw-fund-distributor 2.5.0",
+ "cw-admin-factory",
+ "cw-fund-distributor",
  "cw-orch 0.24.1",
- "cw-payroll-factory 2.5.0",
- "cw-token-swap 2.5.0",
- "cw-tokenfactory-issuer 2.5.0",
- "cw-vesting 2.5.0",
+ "cw-payroll-factory",
+ "cw-token-swap",
+ "cw-tokenfactory-issuer",
+ "cw-vesting",
  "cw20-stake 2.5.0",
- "cw20-stake-external-rewards 2.5.0",
- "cw20-stake-reward-distributor 2.5.0",
+ "cw20-stake-external-rewards",
+ "cw20-stake-reward-distributor",
  "cw721-base 0.18.0",
- "cw721-roles 2.5.0",
+ "cw721-roles",
  "dao-dao-core 2.5.0",
  "dao-interface 2.5.0",
- "dao-migrator 2.5.0",
+ "dao-migrator",
  "dao-pre-propose-approval-single 2.5.0",
- "dao-pre-propose-approver 2.5.0",
+ "dao-pre-propose-approver",
  "dao-pre-propose-multiple 2.5.0",
  "dao-pre-propose-single 2.5.0",
- "dao-proposal-condorcet 2.5.0",
- "dao-proposal-hook-counter 2.5.0",
+ "dao-proposal-condorcet",
+ "dao-proposal-hook-counter",
  "dao-proposal-multiple 2.5.0",
  "dao-proposal-single 2.5.0",
- "dao-proposal-sudo 2.5.0",
- "dao-rewards-distributor 2.5.0",
- "dao-test-custom-factory 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-proposal-sudo",
+ "dao-rewards-distributor",
+ "dao-test-custom-factory",
+ "dao-voting-cw20-balance",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
- "dao-voting-cw721-roles 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
- "dao-voting-token-staked 2.5.0",
- "serde",
-]
-
-[[package]]
-name = "dao-cw-orch"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "btsg-ft-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cosmwasm-std",
- "cw-admin-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-fund-distributor 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-payroll-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-token-swap 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-tokenfactory-issuer 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-vesting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw20-stake-external-rewards 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw20-stake-reward-distributor 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw721-base 0.18.0",
- "cw721-roles 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-dao-core 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-migrator 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-approval-single 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-approver 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-multiple 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-single 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-condorcet 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-hook-counter 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-multiple 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-single 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-sudo 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-rewards-distributor 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-test-custom-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw20-balance 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw20-staked 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw4 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw721-roles 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw721-staked 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-token-staked 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting-cw721-roles",
+ "dao-voting-cw721-staked",
+ "dao-voting-token-staked",
  "serde",
 ]
 
@@ -2788,18 +2427,6 @@ dependencies = [
  "cw4 1.1.2",
 ]
 
-[[package]]
-name = "dao-cw721-extensions"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-orch 0.24.1",
- "cw4 1.1.2",
-]
-
 [[package]]
 name = "dao-dao-core"
 version = "2.4.1"
@@ -2815,7 +2442,7 @@ dependencies = [
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw721 0.18.0",
- "dao-dao-macros 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros 2.4.2",
  "dao-interface 2.4.1",
  "thiserror",
 ]
@@ -2840,30 +2467,11 @@ dependencies = [
  "cw20-base 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "dao-cw-orch 2.5.0",
+ "dao-cw-orch",
  "dao-dao-macros 2.5.0",
  "dao-interface 2.5.0",
- "dao-proposal-sudo 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "thiserror",
-]
-
-[[package]]
-name = "dao-dao-core"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-core",
- "cw-paginate-storage 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-proposal-sudo",
+ "dao-voting-cw20-balance",
  "thiserror",
 ]
 
@@ -2879,17 +2487,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dao-dao-macros"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "dao-dao-macros"
 version = "2.5.0"
@@ -2904,17 +2501,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dao-dao-macros"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "dao-hooks"
 version = "2.4.1"
@@ -2923,25 +2509,12 @@ checksum = "8c85abbadefe491d571f709464a8cfd2fb78b63b0cb6e6ef49104df249e28acc"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-hooks 2.4.2",
  "cw4 1.1.2",
  "dao-pre-propose-base 2.4.1",
  "dao-voting 2.4.1",
 ]
 
-[[package]]
-name = "dao-hooks"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "cw4 1.1.2",
- "dao-pre-propose-base 2.4.2",
- "dao-voting 2.4.2",
-]
-
 [[package]]
 name = "dao-hooks"
 version = "2.5.0"
@@ -2954,19 +2527,6 @@ dependencies = [
  "dao-voting 2.5.0",
 ]
 
-[[package]]
-name = "dao-hooks"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw4 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
-]
-
 [[package]]
 name = "dao-interface"
 version = "2.2.0"
@@ -2996,39 +2556,9 @@ dependencies = [
  "osmosis-std",
 ]
 
-[[package]]
-name = "dao-interface"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.22.2",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0",
- "osmosis-std",
-]
-
-[[package]]
-name = "dao-interface"
-version = "2.5.0"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0",
- "osmosis-std",
-]
-
 [[package]]
 name = "dao-interface"
 version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -3070,44 +2600,11 @@ dependencies = [
  "dao-testing",
  "dao-voting 0.1.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-migrator"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-core",
- "cw-core-interface 0.1.0 (git+https://github.com/DA0-DA0/dao-contracts.git?tag=v1.0.0)",
- "cw-orch 0.24.1",
- "cw-proposal-single",
- "cw-storage-plus 1.2.0",
- "cw-utils 0.13.4",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 0.13.4",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw20-stake 0.2.6",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw20-staked-balance-voting",
- "cw4 0.13.4",
- "cw4-voting",
- "dao-dao-core 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-single 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw20-staked 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting-cw4 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-pre-propose-approval-single"
 version = "2.4.1"
@@ -3153,28 +2650,12 @@ dependencies = [
  "dao-testing",
  "dao-voting 2.4.1",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.4.1",
  "dao-voting-cw4 2.5.0",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-pre-propose-approval-single"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-paginate-storage 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-pre-propose-approver"
 version = "2.5.0"
@@ -3197,26 +2678,10 @@ dependencies = [
  "dao-proposal-single 2.5.0",
  "dao-testing",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
 ]
 
-[[package]]
-name = "dao-pre-propose-approver"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-approval-single 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
-]
-
 [[package]]
 name = "dao-pre-propose-base"
 version = "2.4.1"
@@ -3226,7 +2691,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-denom 2.4.1",
- "cw-hooks 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-hooks 2.4.2",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
@@ -3236,25 +2701,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-pre-propose-base"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.4.2",
- "cw-hooks 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "cw-orch 0.22.2",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-interface 2.4.2",
- "dao-voting 2.4.2",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "dao-pre-propose-base"
 version = "2.5.0"
@@ -3278,29 +2724,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-pre-propose-base"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.4.1",
- "cw-denom 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-base 2.4.1",
- "dao-voting 2.4.1",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "semver",
- "serde",
- "thiserror",
-]
-
 [[package]]
 name = "dao-pre-propose-multiple"
 version = "2.4.1"
@@ -3340,23 +2763,11 @@ dependencies = [
  "dao-testing",
  "dao-voting 2.4.1",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.4.1",
  "dao-voting-cw4 2.5.0",
 ]
 
-[[package]]
-name = "dao-pre-propose-multiple"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw2 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
-]
-
 [[package]]
 name = "dao-pre-propose-single"
 version = "2.4.1"
@@ -3395,23 +2806,11 @@ dependencies = [
  "dao-proposal-single 2.4.1",
  "dao-proposal-single 2.5.0",
  "dao-testing",
- "dao-voting 2.4.1",
- "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
- "dao-voting-cw4 2.4.1",
- "dao-voting-cw4 2.5.0",
-]
-
-[[package]]
-name = "dao-pre-propose-single"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw2 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting 2.4.1",
+ "dao-voting 2.5.0",
+ "dao-voting-cw20-staked",
+ "dao-voting-cw4 2.4.1",
+ "dao-voting-cw4 2.5.0",
 ]
 
 [[package]]
@@ -3437,23 +2836,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-proposal-condorcet"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-proposal-hook-counter"
 version = "2.5.0"
@@ -3473,21 +2855,7 @@ dependencies = [
  "dao-interface 2.5.0",
  "dao-proposal-single 2.5.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "thiserror",
-]
-
-[[package]]
-name = "dao-proposal-hook-counter"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw2 1.1.2",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-voting-cw20-balance",
  "thiserror",
 ]
 
@@ -3499,12 +2867,12 @@ checksum = "51fac47816150063ef09b555f3466f8be99612b76860a20fba7c85bd1854beba"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-hooks 2.4.2",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
- "dao-dao-macros 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros 2.4.2",
  "dao-hooks 2.4.1",
  "dao-interface 2.4.1",
  "dao-pre-propose-base 2.4.1",
@@ -3542,38 +2910,15 @@ dependencies = [
  "dao-testing",
  "dao-voting 0.1.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-balance",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
- "dao-voting-token-staked 2.5.0",
+ "dao-voting-cw721-staked",
+ "dao-voting-token-staked",
  "rand",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-proposal-multiple"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-multiple 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-proposal-single"
 version = "2.4.1"
@@ -3582,14 +2927,14 @@ checksum = "2ce91710cfcff1af520cd0e885eee6972aeefbefc1c9da18349e66ab959269bb"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cw-hooks 2.4.2",
  "cw-proposal-single",
  "cw-storage-plus 1.2.0",
  "cw-utils 0.13.4",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
- "dao-dao-macros 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros 2.4.2",
  "dao-hooks 2.4.1",
  "dao-interface 2.4.1",
  "dao-pre-propose-base 2.4.1",
@@ -3598,30 +2943,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-proposal-single"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "cw-orch 0.22.2",
- "cw-proposal-single",
- "cw-storage-plus 1.2.0",
- "cw-utils 0.13.4",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "dao-dao-macros 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "dao-hooks 2.4.2",
- "dao-interface 2.4.2",
- "dao-pre-propose-base 2.4.2",
- "dao-voting 0.1.0",
- "dao-voting 2.4.2",
- "thiserror",
-]
-
 [[package]]
 name = "dao-proposal-single"
 version = "2.5.0"
@@ -3654,50 +2975,11 @@ dependencies = [
  "dao-testing",
  "dao-voting 0.1.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-balance",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
- "dao-voting-token-staked 2.5.0",
- "thiserror",
-]
-
-[[package]]
-name = "dao-proposal-single"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-proposal-single",
- "cw-storage-plus 1.2.0",
- "cw-utils 0.13.4",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
-[[package]]
-name = "dao-proposal-sudo"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.22.2",
- "cw-storage-plus 1.2.0",
- "cw2 1.1.2",
- "dao-dao-macros 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "dao-interface 2.4.2",
+ "dao-voting-cw721-staked",
+ "dao-voting-token-staked",
  "thiserror",
 ]
 
@@ -3716,21 +2998,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-proposal-sudo"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw2 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-rewards-distributor"
 version = "2.5.0"
@@ -3755,36 +3022,14 @@ dependencies = [
  "dao-interface 2.5.0",
  "dao-testing",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
- "dao-voting-token-staked 2.5.0",
+ "dao-voting-cw721-staked",
+ "dao-voting-token-staked",
  "semver",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-rewards-distributor"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw4 1.1.2",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-test-custom-factory"
 version = "2.5.0"
@@ -3795,7 +3040,7 @@ dependencies = [
  "cw-orch 0.24.1",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
- "cw-tokenfactory-issuer 2.5.0",
+ "cw-tokenfactory-issuer",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw721 0.18.0",
@@ -3806,41 +3051,20 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-test-custom-factory"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-tokenfactory-issuer 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw721 0.18.0",
- "cw721-base 0.18.0",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-testing"
 version = "2.5.0"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-admin-factory 2.5.0",
+ "cw-admin-factory",
  "cw-core",
  "cw-hooks 2.5.0",
  "cw-multi-test",
  "cw-proposal-single",
- "cw-tokenfactory-issuer 2.5.0",
+ "cw-tokenfactory-issuer",
  "cw-utils 1.0.3",
- "cw-vesting 2.5.0",
+ "cw-vesting",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
@@ -3848,23 +3072,23 @@ dependencies = [
  "cw4 1.1.2",
  "cw4-group 1.1.2",
  "cw721-base 0.18.0",
- "cw721-roles 2.5.0",
+ "cw721-roles",
  "dao-dao-core 2.5.0",
  "dao-interface 2.5.0",
  "dao-pre-propose-multiple 2.5.0",
  "dao-pre-propose-single 2.5.0",
- "dao-proposal-condorcet 2.5.0",
+ "dao-proposal-condorcet",
  "dao-proposal-single 2.5.0",
- "dao-test-custom-factory 2.5.0",
+ "dao-test-custom-factory",
  "dao-voting 0.1.0",
  "dao-voting 2.5.0",
- "dao-voting-cw20-balance 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
+ "dao-voting-cw20-balance",
+ "dao-voting-cw20-staked",
  "dao-voting-cw4 2.5.0",
- "dao-voting-cw721-roles 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
+ "dao-voting-cw721-roles",
+ "dao-voting-cw721-staked",
  "dao-voting-onft-staked",
- "dao-voting-token-staked 2.5.0",
+ "dao-voting-token-staked",
  "osmosis-std",
  "osmosis-test-tube",
  "rand",
@@ -3897,27 +3121,11 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw20 1.1.2",
- "dao-dao-macros 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros 2.4.2",
  "dao-interface 2.4.1",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting"
-version = "2.4.2"
-source = "git+https://github.com/Kayanski/dao-contracts?branch=development#8c945acdb0746ec84d15cfebeadcfe32122f85a2"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.4.2",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw20 1.1.2",
- "dao-dao-macros 2.4.2 (git+https://github.com/Kayanski/dao-contracts?branch=development)",
- "dao-interface 2.4.2",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting"
 version = "2.5.0"
@@ -3933,22 +3141,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw20 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-cw20-balance"
 version = "2.5.0"
@@ -3967,24 +3159,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-cw20-balance"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-cw20-staked"
 version = "2.5.0"
@@ -4005,26 +3179,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-cw20-staked"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw20-base 1.1.2",
- "cw20-stake 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-cw4"
 version = "2.4.1"
@@ -4038,7 +3192,7 @@ dependencies = [
  "cw2 1.1.2",
  "cw4 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-macros 2.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dao-dao-macros 2.4.2",
  "dao-interface 2.4.1",
  "thiserror",
 ]
@@ -4061,24 +3215,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-cw4"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw4 1.1.2",
- "cw4-group 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-cw721-roles"
 version = "2.5.0"
@@ -4095,37 +3231,15 @@ dependencies = [
  "cw4 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "cw721-controllers 2.5.0",
- "cw721-roles 2.5.0",
- "dao-cw721-extensions 2.5.0",
+ "cw721-controllers",
+ "cw721-roles",
+ "dao-cw721-extensions",
  "dao-dao-macros 2.5.0",
  "dao-interface 2.5.0",
  "dao-testing",
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-cw721-roles"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw4 1.1.2",
- "cw721 0.18.0",
- "cw721-base 0.18.0",
- "cw721-controllers 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-cw721-extensions 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-cw721-staked"
 version = "2.5.0"
@@ -4142,13 +3256,13 @@ dependencies = [
  "cw2 1.1.2",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "cw721-controllers 2.5.0",
+ "cw721-controllers",
  "dao-dao-macros 2.5.0",
  "dao-hooks 2.5.0",
  "dao-interface 2.5.0",
- "dao-proposal-hook-counter 2.5.0",
+ "dao-proposal-hook-counter",
  "dao-proposal-single 2.5.0",
- "dao-test-custom-factory 2.5.0",
+ "dao-test-custom-factory",
  "dao-testing",
  "dao-voting 2.5.0",
  "osmosis-std",
@@ -4157,29 +3271,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-cw721-staked"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw721 0.18.0",
- "cw721-base 0.18.0",
- "cw721-controllers 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "dao-voting-onft-staked"
 version = "2.5.0"
@@ -4193,13 +3284,13 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "cw721-controllers 2.5.0",
+ "cw721-controllers",
  "dao-dao-macros 2.5.0",
  "dao-hooks 2.5.0",
  "dao-interface 2.5.0",
- "dao-proposal-hook-counter 2.5.0",
+ "dao-proposal-hook-counter",
  "dao-proposal-single 2.5.0",
- "dao-test-custom-factory 2.5.0",
+ "dao-test-custom-factory",
  "dao-testing",
  "dao-voting 2.5.0",
  "omniflix-std",
@@ -4223,15 +3314,15 @@ dependencies = [
  "cw-orch 0.24.1",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
- "cw-tokenfactory-issuer 2.5.0",
+ "cw-tokenfactory-issuer",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "dao-dao-macros 2.5.0",
  "dao-hooks 2.5.0",
  "dao-interface 2.5.0",
- "dao-proposal-hook-counter 2.5.0",
+ "dao-proposal-hook-counter",
  "dao-proposal-single 2.5.0",
- "dao-test-custom-factory 2.5.0",
+ "dao-test-custom-factory",
  "dao-testing",
  "dao-voting 2.5.0",
  "osmosis-std",
@@ -4240,28 +3331,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "dao-voting-token-staked"
-version = "2.5.0"
-source = "git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch#a43d59936f4e7d548b889de9ba2ab093d2743bac"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-orch 0.24.1",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-tokenfactory-issuer 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-hooks 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "thiserror",
-]
-
 [[package]]
 name = "der"
 version = "0.6.1"
@@ -5138,21 +4207,21 @@ dependencies = [
  "cosmos-sdk-proto 0.19.0",
  "cosmwasm-std",
  "cw-utils 1.0.3",
- "cw-vesting 2.5.0",
+ "cw-vesting",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 2.5.0",
  "cw721 0.18.0",
  "cw721-base 0.18.0",
- "cw721-roles 2.5.0",
+ "cw721-roles",
  "dao-dao-core 2.5.0",
  "dao-interface 2.5.0",
  "dao-pre-propose-single 2.5.0",
  "dao-proposal-single 2.5.0",
- "dao-test-custom-factory 2.5.0",
+ "dao-test-custom-factory",
  "dao-voting 2.5.0",
- "dao-voting-cw20-staked 2.5.0",
- "dao-voting-cw721-staked 2.5.0",
+ "dao-voting-cw20-staked",
+ "dao-voting-cw721-staked",
  "env_logger",
  "once_cell",
  "rand",
@@ -6325,21 +5394,21 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 name = "scripts"
 version = "2.5.0"
 dependencies = [
- "btsg-ft-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-admin-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "btsg-ft-factory",
+ "cw-admin-factory",
  "cw-orch 0.24.1",
- "cw-payroll-factory 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-token-swap 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-tokenfactory-issuer 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw-vesting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "cw721-roles 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-cw-orch 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "cw-payroll-factory",
+ "cw-token-swap",
+ "cw-tokenfactory-issuer",
+ "cw-vesting",
+ "cw721-roles",
+ "dao-cw-orch",
  "dao-interface 2.2.0",
- "dao-interface 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-migrator 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
- "dao-proposal-single 2.4.2",
- "dao-proposal-sudo 2.4.2",
- "dao-voting 2.5.0 (git+https://github.com/hard-nett/dao-contracts?branch=feat/external-cw-orch)",
+ "dao-interface 2.5.0",
+ "dao-migrator",
+ "dao-proposal-single 2.5.0",
+ "dao-proposal-sudo",
+ "dao-voting 2.5.0",
  "dotenv",
  "pretty_env_logger",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index ecd9b0da9..de54bfda4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,6 +87,7 @@ cw-orch = "0.24.1"
 # optional owner.
 cw-ownable = "0.5"
 
+btsg-ft-factory = { path = "./contracts/external/btsg-ft-factory", version = "2.5.0" }
 cw-admin-factory = { path = "./contracts/external/cw-admin-factory", version = "2.5.0" }
 cw-denom = { path = "./packages/cw-denom", version = "2.5.0" }
 cw-fund-distributor = { path = "./contracts/distribution/cw-fund-distributor", version = "2.5.0" }
@@ -94,6 +95,7 @@ cw-hooks = { path = "./packages/cw-hooks", version = "2.5.0" }
 cw-paginate-storage = { path = "./packages/cw-paginate-storage", version = "2.5.0" }
 cw-payroll-factory = { path = "./contracts/external/cw-payroll-factory", version = "2.5.0" }
 cw-stake-tracker = { path = "./packages/cw-stake-tracker", version = "2.5.0" }
+cw-token-swap = { path = "./contracts/external/cw-token-swap", version = "2.5.0" }
 cw-tokenfactory-issuer = { path = "./contracts/external/cw-tokenfactory-issuer", version = "2.5.0", default-features = false }
 cw-tokenfactory-types = { path = "./packages/cw-tokenfactory-types", version = "2.5.0", default-features = false }
 cw-vesting = { path = "./contracts/external/cw-vesting", version = "2.5.0" }
@@ -106,6 +108,7 @@ dao-dao-core = { path = "./contracts/dao-dao-core", version = "2.5.0" }
 dao-dao-macros = { path = "./packages/dao-dao-macros", version = "2.5.0" }
 dao-hooks = { path = "./packages/dao-hooks", version = "2.5.0" }
 dao-interface = { path = "./packages/dao-interface", version = "2.5.0" }
+dao-migrator = { path = "./contracts/external/dao-migrator", version = "2.5.0" }
 dao-pre-propose-approval-single = { path = "./contracts/pre-propose/dao-pre-propose-approval-single", version = "2.5.0" }
 dao-pre-propose-approver = { path = "./contracts/pre-propose/dao-pre-propose-approver", version = "2.5.0" }
 dao-pre-propose-base = { path = "./packages/dao-pre-propose-base", version = "2.5.0" }
diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml
index 5266c6025..4ae7ec307 100644
--- a/scripts/Cargo.toml
+++ b/scripts/Cargo.toml
@@ -6,30 +6,24 @@ repository.workspace = true
 version.workspace = true
 
 [dependencies]
-cw-orch = { workspace = true, features = ["daemon"] }
-dao-cw-orch = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-
+cw-orch      = { workspace = true, features = ["daemon"] }
+dao-cw-orch  = { path = "../packages/cw-orch", version = "2.5.0"  }
 # scripts specific
 dotenv = { version = "0.15.0" }
 pretty_env_logger = { version = "0.5.0" }
 
 # cw-orch enabled DAO DAO deps
 [dev-dependencies]
-dao-interface-master = { package = "dao-interface", git = "https://github.com/DA0-DA0/dao-contracts", branch = "main" }
-dao-proposal-sudo = { git = "https://github.com/Kayanski/dao-contracts", branch = "development", features = [
-    "library",
-] }
-dao-proposal-single = { git = "https://github.com/Kayanski/dao-contracts", branch = "development", features = [
-    "library",
-] }
-
-dao-interface           = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-dao-voting              = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw-payroll-factory      = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw-token-swap           = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw-admin-factory        = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw-tokenfactory-issuer  = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw-vesting              = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-cw721-roles             = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-dao-migrator            = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
-btsg-ft-factory         = { git = "https://github.com/hard-nett/dao-contracts", branch = "feat/external-cw-orch" }
\ No newline at end of file
+dao-interface-master    = { package = "dao-interface", git = "https://github.com/DA0-DA0/dao-contracts", branch = "main" }
+dao-proposal-sudo       = { workspace = true, features = ["library"] }
+dao-proposal-single     = { workspace = true, features = ["library"] }
+dao-interface           = { workspace = true }
+dao-voting              = { workspace = true }
+cw-payroll-factory      = { workspace = true }
+cw-token-swap           = { workspace = true }
+cw-admin-factory        = { workspace = true }
+cw-tokenfactory-issuer  = { workspace = true }
+cw-vesting              = { workspace = true }
+cw721-roles             = { workspace = true }
+dao-migrator            = { workspace = true }
+btsg-ft-factory         = { workspace = true }
\ No newline at end of file
diff --git a/scripts/src/dao.rs b/scripts/src/dao.rs
index ba1c68268..144f03e57 100644
--- a/scripts/src/dao.rs
+++ b/scripts/src/dao.rs
@@ -1,9 +1,5 @@
 use cw_orch::prelude::*;
-use dao_cw_orch::{
-    DaoDaoCore, DaoExternalAdminFactory, DaoExternalCw721Roles, DaoExternalCwVesting,
-    DaoExternalMigrator, DaoExternalPayrollFactory, DaoExternalTokenSwap,
-    DaoExternalTokenfactoryIssuer, DaoProposalSingle, DaoProposalSudo,
-};
+use dao_cw_orch::{DaoDaoCore, DaoProposalSingle, DaoProposalSudo};
 
 // minimal dao
 pub struct DaoDao<Chain> {