diff --git a/Cargo.lock b/Cargo.lock
index f9ec2b4..3e57312 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -128,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
 
 [[package]]
 name = "arena-competition-enrollment"
@@ -149,9 +149,9 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "serde",
  "thiserror",
 ]
@@ -168,9 +168,9 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "glicko_2",
  "serde",
  "thiserror",
@@ -209,9 +209,9 @@ dependencies = [
  "cw-utils 1.0.3",
  "cw20 1.1.2",
  "cw721 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "serde",
 ]
 
@@ -230,7 +230,7 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
  "itertools 0.13.0",
  "thiserror",
 ]
@@ -261,12 +261,12 @@ dependencies = [
  "cw-address-like",
  "cw-orch 0.24.1",
  "cw-ownable",
- "cw-payroll-factory 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "cw-payroll-factory",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
- "cw-vesting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "cw-vesting",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
  "serde",
  "serde_json",
  "thiserror",
@@ -287,7 +287,7 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
  "itertools 0.13.0",
  "thiserror",
 ]
@@ -318,7 +318,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -340,18 +340,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -574,7 +574,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "syn_derive",
 ]
 
@@ -589,15 +589,15 @@ dependencies = [
 
 [[package]]
 name = "btsg-ft-factory"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "osmosis-std-derive",
  "prost 0.12.3",
  "prost-derive 0.12.3",
@@ -652,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "shlex",
 ]
@@ -916,9 +916,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
  "libc",
 ]
@@ -1108,7 +1108,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1135,8 +1135,8 @@ dependencies = [
 
 [[package]]
 name = "cw-admin-factory"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1173,9 +1173,9 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "serde",
  "thiserror",
 ]
@@ -1304,19 +1304,8 @@ dependencies = [
 
 [[package]]
 name = "cw-denom"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw20 1.1.2",
- "thiserror",
-]
-
-[[package]]
-name = "cw-denom"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1326,19 +1315,19 @@ dependencies = [
 
 [[package]]
 name = "cw-fund-distributor"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-orch 0.24.1",
- "cw-paginate-storage 2.5.0",
+ "cw-paginate-storage 2.5.0-callbacks",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
- "cw20-stake 2.5.0",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw20-stake 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "dao-voting-cw20-staked",
  "thiserror",
 ]
@@ -1357,19 +1346,8 @@ dependencies = [
 
 [[package]]
 name = "cw-hooks"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "thiserror",
-]
-
-[[package]]
-name = "cw-hooks"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1452,7 +1430,7 @@ checksum = "5bc8ba75692fc7bd30e91c78fad2dc208a738e4e6ea26b232f9352c320e35543"
 dependencies = [
  "convert_case",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1655,8 +1633,8 @@ dependencies = [
 
 [[package]]
 name = "cw-paginate-storage"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-std",
  "cw-storage-plus 1.2.0",
@@ -1665,34 +1643,17 @@ dependencies = [
 
 [[package]]
 name = "cw-payroll-factory"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw-ownable",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw-vesting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "thiserror",
-]
-
-[[package]]
-name = "cw-payroll-factory"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-denom 2.5.0-callbacks",
  "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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-vesting",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "thiserror",
@@ -1725,22 +1686,12 @@ dependencies = [
 
 [[package]]
 name = "cw-stake-tracker"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-wormhole 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
-]
-
-[[package]]
-name = "cw-stake-tracker"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-wormhole 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-wormhole",
 ]
 
 [[package]]
@@ -1778,8 +1729,8 @@ dependencies = [
 
 [[package]]
 name = "cw-token-swap"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1793,8 +1744,8 @@ dependencies = [
 
 [[package]]
 name = "cw-tokenfactory-issuer"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -1803,7 +1754,7 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "cw-tokenfactory-types",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "osmosis-std",
  "prost 0.12.3",
  "prost-derive 0.12.3",
@@ -1814,12 +1765,12 @@ dependencies = [
 
 [[package]]
 name = "cw-tokenfactory-types"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "osmosis-std",
  "osmosis-std-derive",
  "prost 0.12.3",
@@ -1874,38 +1825,18 @@ dependencies = [
 
 [[package]]
 name = "cw-vesting"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw-ownable",
- "cw-stake-tracker 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw-wormhole 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "serde",
- "thiserror",
- "wynd-utils",
-]
-
-[[package]]
-name = "cw-vesting"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-denom 2.5.0-callbacks",
  "cw-orch 0.24.1",
  "cw-ownable",
- "cw-stake-tracker 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-stake-tracker",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
- "cw-wormhole 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-wormhole",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "serde",
@@ -1915,19 +1846,8 @@ dependencies = [
 
 [[package]]
 name = "cw-wormhole"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 1.2.0",
- "serde",
-]
-
-[[package]]
-name = "cw-wormhole"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2073,16 +1993,16 @@ dependencies = [
 
 [[package]]
 name = "cw20-stake"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "cw-orch 0.24.1",
  "cw-ownable",
- "cw-paginate-storage 2.5.0",
+ "cw-paginate-storage 2.5.0-callbacks",
  "cw-storage-plus 1.2.0",
  "cw-utils 0.13.4",
  "cw-utils 1.0.3",
@@ -2091,14 +2011,14 @@ dependencies = [
  "cw20-base 1.1.2",
  "cw20-stake 0.2.6",
  "dao-hooks",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "cw20-stake-external-rewards"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2111,7 +2031,7 @@ dependencies = [
  "cw20 0.13.4",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "cw20-stake 2.5.0",
+ "cw20-stake 2.5.0-callbacks",
  "dao-hooks",
  "stake-cw20-external-rewards",
  "thiserror",
@@ -2119,8 +2039,8 @@ dependencies = [
 
 [[package]]
 name = "cw20-stake-reward-distributor"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2131,7 +2051,7 @@ dependencies = [
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "cw20-stake 2.5.0",
+ "cw20-stake 2.5.0-callbacks",
  "stake-cw20-reward-distributor",
  "thiserror",
 ]
@@ -2354,8 +2274,8 @@ dependencies = [
 
 [[package]]
 name = "cw721-controllers"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2366,8 +2286,8 @@ dependencies = [
 
 [[package]]
 name = "cw721-roles"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2387,25 +2307,25 @@ dependencies = [
 
 [[package]]
 name = "dao-cw-orch"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "btsg-ft-factory",
  "cosmwasm-std",
  "cw-admin-factory",
  "cw-fund-distributor",
  "cw-orch 0.24.1",
- "cw-payroll-factory 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-payroll-factory",
  "cw-token-swap",
  "cw-tokenfactory-issuer",
- "cw-vesting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "cw20-stake 2.5.0",
+ "cw-vesting",
+ "cw20-stake 2.5.0-callbacks",
  "cw20-stake-external-rewards",
  "cw20-stake-reward-distributor",
  "cw721-base 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cw721-roles",
  "dao-dao-core",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "dao-migrator",
  "dao-pre-propose-approval-single",
  "dao-pre-propose-approver",
@@ -2429,8 +2349,8 @@ dependencies = [
 
 [[package]]
 name = "dao-cw721-extensions"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2441,20 +2361,20 @@ dependencies = [
 
 [[package]]
 name = "dao-dao-core"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-core",
- "cw-paginate-storage 2.5.0",
+ "cw-paginate-storage 2.5.0-callbacks",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw721 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
@@ -2472,19 +2392,8 @@ dependencies = [
 
 [[package]]
 name = "dao-dao-macros"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "dao-dao-macros"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "proc-macro2",
@@ -2494,15 +2403,15 @@ dependencies = [
 
 [[package]]
 name = "dao-hooks"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "cw4 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
 ]
 
 [[package]]
@@ -2522,22 +2431,8 @@ dependencies = [
 
 [[package]]
 name = "dao-interface"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "cw721 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "osmosis-std",
-]
-
-[[package]]
-name = "dao-interface"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2551,8 +2446,8 @@ dependencies = [
 
 [[package]]
 name = "dao-migrator"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2568,15 +2463,15 @@ dependencies = [
  "cw20 1.1.2",
  "cw20-base 1.1.2",
  "cw20-stake 0.2.6",
- "cw20-stake 2.5.0",
+ "cw20-stake 2.5.0-callbacks",
  "cw20-staked-balance-voting",
  "cw4 0.13.4",
  "cw4-voting",
  "dao-dao-core",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "dao-proposal-single",
  "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "dao-voting-cw20-staked",
  "dao-voting-cw4",
  "thiserror",
@@ -2584,34 +2479,34 @@ dependencies = [
 
 [[package]]
 name = "dao-pre-propose-approval-single"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-paginate-storage 2.5.0",
+ "cw-paginate-storage 2.5.0-callbacks",
  "cw-storage-plus 1.2.0",
  "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-pre-propose-approver"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "dao-pre-propose-approval-single",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
 ]
 
 [[package]]
@@ -2635,44 +2530,22 @@ dependencies = [
 
 [[package]]
 name = "dao-pre-propose-base"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-denom 2.4.1",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "cw-storage-plus 1.2.0",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-pre-propose-base 2.4.1",
- "dao-voting 2.4.1",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "semver",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "dao-pre-propose-base"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.4.1",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-denom 2.5.0-callbacks",
+ "cw-hooks 2.5.0-callbacks",
  "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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "dao-pre-propose-base 2.4.1",
  "dao-voting 2.4.1",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "semver",
  "serde",
  "thiserror",
@@ -2680,32 +2553,32 @@ dependencies = [
 
 [[package]]
 name = "dao-pre-propose-multiple"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw2 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
 ]
 
 [[package]]
 name = "dao-pre-propose-single"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw2 1.1.2",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-pre-propose-base 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
 ]
 
 [[package]]
 name = "dao-proposal-condorcet"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2713,16 +2586,16 @@ dependencies = [
  "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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-proposal-hook-counter"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2735,35 +2608,35 @@ dependencies = [
 
 [[package]]
 name = "dao-proposal-multiple"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
  "dao-hooks",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
  "dao-pre-propose-multiple",
  "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-proposal-single"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "cw-orch 0.24.1",
  "cw-proposal-single",
  "cw-storage-plus 1.2.0",
@@ -2771,34 +2644,34 @@ dependencies = [
  "cw-utils 1.0.3",
  "cw2 1.1.2",
  "cw20 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
  "dao-hooks",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-pre-propose-base 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-pre-propose-base 2.5.0-callbacks",
  "dao-voting 0.1.0",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-proposal-sudo"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-rewards-distributor"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2812,16 +2685,16 @@ dependencies = [
  "cw20-base 1.1.2",
  "cw4 1.1.2",
  "dao-hooks",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "semver",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-test-custom-factory"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2833,9 +2706,9 @@ dependencies = [
  "cw2 1.1.2",
  "cw721 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cw721-base 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
@@ -2870,40 +2743,24 @@ dependencies = [
 
 [[package]]
 name = "dao-voting"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=development#a417f9de15cf2e5d252c017feb67393eb1dfa4d1"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
+ "cw-denom 2.5.0-callbacks",
  "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/DA0-DA0/dao-contracts?branch=development)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "thiserror",
-]
-
-[[package]]
-name = "dao-voting"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-denom 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "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/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-cw20-balance"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2913,15 +2770,15 @@ dependencies = [
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-cw20-staked"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2931,17 +2788,17 @@ dependencies = [
  "cw2 1.1.2",
  "cw20 1.1.2",
  "cw20-base 1.1.2",
- "cw20-stake 2.5.0",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw20-stake 2.5.0-callbacks",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-cw4"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2951,15 +2808,15 @@ dependencies = [
  "cw2 1.1.2",
  "cw4 1.1.2",
  "cw4-group 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-cw721-roles"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
@@ -2973,20 +2830,20 @@ dependencies = [
  "cw721-base 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cw721-controllers",
  "dao-cw721-extensions",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
+ "dao-interface 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-cw721-staked"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "cw-orch 0.24.1",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
@@ -2994,32 +2851,32 @@ dependencies = [
  "cw721 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cw721-base 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cw721-controllers",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
  "dao-hooks",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
 [[package]]
 name = "dao-voting-token-staked"
-version = "2.5.0"
-source = "git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface#685211d934c510f55cdc1a531a0802ef0016fc4a"
+version = "2.5.0-callbacks"
+source = "git+https://github.com/ismellike/dao-contracts?branch=fork/v2.5.0-callbacks#e1b675a50e7877bd9fa4314febbfb8d6225313ff"
 dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-controllers 1.1.2",
- "cw-hooks 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-hooks 2.5.0-callbacks",
  "cw-orch 0.24.1",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw-tokenfactory-issuer",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
- "dao-dao-macros 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-dao-macros 2.5.0-callbacks",
  "dao-hooks",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
+ "dao-voting 2.5.0-callbacks",
  "thiserror",
 ]
 
@@ -3043,7 +2900,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3054,7 +2911,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3319,7 +3176,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3607,7 +3464,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3850,9 +3707,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -3860,9 +3717,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "is-terminal"
@@ -4141,7 +3998,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4164,9 +4021,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -4206,7 +4063,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4250,6 +4107,8 @@ dependencies = [
  "cosmwasm-std",
  "cw-orch 0.24.1",
  "cw721-base 0.18.0 (git+https://github.com/AbstractSDK/cw-nfts?branch=main)",
+ "dao-dao-core",
+ "dao-interface 2.5.0-callbacks",
 ]
 
 [[package]]
@@ -4369,7 +4228,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4522,7 +4381,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4864,18 +4723,18 @@ checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.35"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -4950,11 +4809,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4978,7 +4837,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5005,17 +4864,15 @@ dependencies = [
  "cw-balance",
  "cw-orch 0.24.1",
  "cw-orch-clone-testing",
- "cw-payroll-factory 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-payroll-factory",
  "cw-utils 1.0.3",
- "cw-vesting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "cw-vesting",
  "cw4 1.1.2",
  "dao-cw-orch",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-interface 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-interface 2.5.0-callbacks",
  "dao-proposal-single",
  "dao-proposal-sudo",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=development)",
- "dao-voting 2.5.0 (git+https://github.com/DA0-DA0/dao-contracts?branch=feature/cw-orch-interface)",
+ "dao-voting 2.5.0-callbacks",
  "dao-voting-cw4",
  "dotenv",
  "itertools 0.13.0",
@@ -5110,9 +4967,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -5157,13 +5014,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5174,7 +5031,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5197,7 +5054,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5409,9 +5266,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5427,7 +5284,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5622,7 +5479,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5672,9 +5529,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5706,7 +5563,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -5731,9 +5588,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -5742,9 +5599,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -5774,7 +5631,7 @@ version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
- "indexmap 2.4.0",
+ "indexmap 2.5.0",
  "toml_datetime",
  "winnow",
 ]
@@ -5861,7 +5718,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -6021,7 +5878,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "wasm-bindgen-shared",
 ]
 
@@ -6078,7 +5935,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6559,7 +6416,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -6579,5 +6436,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 7f8acd8..237e626 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,32 +65,33 @@ arena-token-gateway = { path = "./contracts/arena-token-gateway" }
 arena-payment-registry = { path = "./contracts/arena-payment-registry" }
 
 #dao dependencies
-dao-interface = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development" }
-cw-vesting = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-interface = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks" }
+dao-cw-orch = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks" }
+cw-vesting = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-cw-payroll-factory = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+cw-payroll-factory = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-proposal-multiple = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-proposal-multiple = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-proposal-single = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-proposal-single = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-pre-propose-single = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-pre-propose-single = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-voting = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development" }
-dao-voting-cw4 = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-voting = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks" }
+dao-voting-cw4 = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-proposal-sudo = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-proposal-sudo = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-pre-propose-base = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-pre-propose-base = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
-dao-dao-core = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "development", features = [
+dao-dao-core = { git = "https://github.com/ismellike/dao-contracts", branch = "fork/v2.5.0-callbacks", features = [
 	"library",
 ] }
diff --git a/contracts/arena-core/src/contract.rs b/contracts/arena-core/src/contract.rs
index 87a0377..8ea4e44 100644
--- a/contracts/arena-core/src/contract.rs
+++ b/contracts/arena-core/src/contract.rs
@@ -19,7 +19,7 @@ use cosmwasm_std::{
 };
 use cw2::{ensure_from_older_version, set_contract_version};
 use cw_utils::parse_reply_instantiate_data;
-use dao_interface::{msg::ExecuteMsg as DAOCoreExecuteMsg, state::ModuleInstantiateCallback};
+use dao_interface::{msg::ExecuteMsg as DAOCoreExecuteMsg, state::CallbackMessages};
 
 pub(crate) const CONTRACT_NAME: &str = "crates.io:arena-core";
 pub(crate) const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -133,7 +133,7 @@ pub fn instantiate_extension(
 
     Ok(prepropose_response
         .add_messages(msgs)
-        .set_data(to_json_binary(&ModuleInstantiateCallback {
+        .set_data(to_json_binary(&CallbackMessages {
             msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
                 contract_addr: dao.to_string(),
                 msg: to_json_binary(&DAOCoreExecuteMsg::SetItem {
@@ -231,7 +231,7 @@ pub fn reply(deps: DepsMut, env: Env, msg: Reply) -> Result<Response, ContractEr
 
             // Check for module instantiation callbacks
             let callback_msgs = match res.data {
-                Some(data) => from_json::<ModuleInstantiateCallback>(&data)
+                Some(data) => from_json::<CallbackMessages>(&data)
                     .map(|m| m.msgs)
                     .unwrap_or_else(|_| vec![]),
                 None => vec![],
diff --git a/contracts/arena-token-gateway/Cargo.toml b/contracts/arena-token-gateway/Cargo.toml
index d36a131..aa1aa7a 100644
--- a/contracts/arena-token-gateway/Cargo.toml
+++ b/contracts/arena-token-gateway/Cargo.toml
@@ -28,4 +28,4 @@ cw-address-like = { workspace = true }
 cw-vesting = { workspace = true }
 cw-payroll-factory = { workspace = true }
 dao-interface = { workspace = true }
-serde_json = { workspace = true }
\ No newline at end of file
+serde_json = { workspace = true }
diff --git a/contracts/arena-token-gateway/src/execute.rs b/contracts/arena-token-gateway/src/execute.rs
index 27d54ca..a135488 100644
--- a/contracts/arena-token-gateway/src/execute.rs
+++ b/contracts/arena-token-gateway/src/execute.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
 use cw_ownable::assert_owner;
 use cw_utils::one_coin;
 use cw_vesting::vesting::Schedule;
-use dao_interface::state::ModuleInstantiateCallback;
+use dao_interface::state::CallbackMessages;
 
 use crate::{
     helpers::get_payroll_address,
@@ -122,7 +122,7 @@ pub fn accept_application(
     let payroll_factory = get_payroll_address(deps.as_ref(), &env.block.chain_id)?;
 
     // Prepare the instantiate message for the vesting contract
-    let vesting_data = to_json_binary(&ModuleInstantiateCallback {
+    let vesting_data = to_json_binary(&CallbackMessages {
         msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
             contract_addr: payroll_factory.to_string(),
             msg: to_json_binary(
diff --git a/contracts/arena-wager-module/Cargo.toml b/contracts/arena-wager-module/Cargo.toml
index 4630f37..657ce7d 100644
--- a/contracts/arena-wager-module/Cargo.toml
+++ b/contracts/arena-wager-module/Cargo.toml
@@ -20,4 +20,4 @@ cosmwasm-std = { workspace = true }
 cw2 = { workspace = true }
 cw-competition-base = { workspace = true }
 arena-interface = { workspace = true }
-cw-orch = { workspace = true }
\ No newline at end of file
+cw-orch = { workspace = true }
diff --git a/packages/orch-interface/Cargo.toml b/packages/orch-interface/Cargo.toml
index 4ac2d1f..4697cdf 100644
--- a/packages/orch-interface/Cargo.toml
+++ b/packages/orch-interface/Cargo.toml
@@ -10,6 +10,8 @@ doctest = false
 
 [dependencies]
 cw-orch = { workspace = true }
+dao-dao-core = { workspace = true }
+dao-interface = { workspace = true }
 arena-wager-module = { workspace = true }
 arena-league-module = { workspace = true }
 arena-tournament-module = { workspace = true }
@@ -22,5 +24,4 @@ arena-payment-registry = { workspace = true }
 cosmwasm-std = { workspace = true }
 
 cw4-group = { package = "abstract-cw4-group", git = "https://github.com/AbstractSDK/cw-plus", branch = "abstract_versions" }
-# cw20-base = { package = "abstract-cw20-base", git = "https://github.com/AbstractSDK/cw-plus", branch = "abstract_versions" }
 cw721-base = { git = "https://github.com/AbstractSDK/cw-nfts", branch = "main" }
diff --git a/packages/orch-interface/src/dao_dao_core.rs b/packages/orch-interface/src/dao_dao_core.rs
new file mode 100644
index 0000000..fc558eb
--- /dev/null
+++ b/packages/orch-interface/src/dao_dao_core.rs
@@ -0,0 +1,29 @@
+use cw_orch::interface;
+#[cfg(not(target_arch = "wasm32"))]
+use cw_orch::prelude::*;
+
+#[allow(unused_imports)]
+use dao_interface::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+
+pub const CONTRACT_ID: &str = "dao_dao_core";
+
+#[interface(InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, id = CONTRACT_ID)]
+pub struct DaoDaoCoreContract;
+
+#[cfg(not(target_arch = "wasm32"))]
+impl<Chain> Uploadable for DaoDaoCoreContract<Chain> {
+    /// Return the path to the wasm file corresponding to the contract
+    fn wasm(_chain: &ChainInfoOwned) -> WasmPath {
+        artifacts_dir_from_workspace!()
+            .find_wasm_path(CONTRACT_ID)
+            .unwrap()
+    }
+    /// Returns a CosmWasm contract wrapper
+    fn wrapper() -> Box<dyn MockContract<Empty>> {
+        Box::new(ContractWrapper::new_with_empty(
+            arena_token_gateway::contract::execute,
+            arena_token_gateway::contract::instantiate,
+            arena_token_gateway::contract::query,
+        ))
+    }
+}
diff --git a/packages/orch-interface/src/lib.rs b/packages/orch-interface/src/lib.rs
index b6113d4..abd2f12 100644
--- a/packages/orch-interface/src/lib.rs
+++ b/packages/orch-interface/src/lib.rs
@@ -8,3 +8,4 @@ pub mod arena_tournament_module;
 pub mod arena_wager_module;
 pub mod cw4_group;
 pub mod cw721_base;
+pub mod dao_dao_core;
diff --git a/scripts/Cargo.toml b/scripts/Cargo.toml
index f9a627d..57e190f 100644
--- a/scripts/Cargo.toml
+++ b/scripts/Cargo.toml
@@ -17,7 +17,7 @@ cosmwasm-std = { workspace = true }
 orch-interface = { workspace = true }
 cw-utils = { workspace = true }
 cw-balance = { workspace = true }
-dao-cw-orch = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
+dao-cw-orch = { workspace = true }
 itertools = { workspace = true }
 arena-competition-enrollment = { workspace = true }
 arena-token-gateway = { workspace = true }
@@ -25,24 +25,17 @@ arena-payment-registry = { workspace = true }
 cosmwasm-schema = { workspace = true }
 serde_json = { workspace = true }
 
+# DA0 DA0
+dao-interface = { workspace = true }
+dao-voting = { workspace = true }
+dao-proposal-sudo = { workspace = true }
+dao-proposal-single = { workspace = true }
+cw-vesting = { workspace = true }
+cw-payroll-factory = { workspace = true }
+dao-voting-cw4 = { workspace = true }
+cw4 = { workspace = true }
+
 # scripts specific
 dotenv = { version = "0.15.0" }
 pretty_env_logger = { version = "0.5.0" }
 cw-orch-clone-testing = "0.6.4"
-
-# cw-orch enabled DAO DAO deps
-[dev-dependencies]
-dao-interface-master = { package = "dao-interface", git = "https://github.com/DA0-DA0/dao-contracts", branch = "development" }
-dao-voting-master = { package = "dao-voting", git = "https://github.com/DA0-DA0/dao-contracts", branch = "development" }
-dao-interface = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
-dao-proposal-sudo = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface", features = [
-    "library",
-] }
-dao-proposal-single = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface", features = [
-    "library",
-] }
-dao-voting = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
-cw-vesting  = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
-cw-payroll-factory  = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
-dao-voting-cw4  = { git = "https://github.com/DA0-DA0/dao-contracts", branch = "feature/cw-orch-interface" }
-cw4 = { workspace = true }
\ No newline at end of file
diff --git a/scripts/src/main.rs b/scripts/src/main.rs
index e8b7cce..2fecd81 100644
--- a/scripts/src/main.rs
+++ b/scripts/src/main.rs
@@ -5,7 +5,7 @@ use orch_interface::{
     arena_core::ArenaCoreContract, arena_league_module::ArenaLeagueModuleContract,
     arena_token_gateway::ArenaTokenGatewayContract,
     arena_tournament_module::ArenaTournamentModuleContract,
-    arena_wager_module::ArenaWagerModuleContract,
+    arena_wager_module::ArenaWagerModuleContract, dao_dao_core::DaoDaoCoreContract,
 };
 use std::env;
 
@@ -45,6 +45,7 @@ enum DeployComponent {
     Enrollment,
     TokenGateway,
     CompetitionModules,
+    DaoCore,
 }
 
 fn parse_command(args: &[String]) -> Command {
@@ -65,6 +66,7 @@ fn parse_command(args: &[String]) -> Command {
         "enrollment" => DeployComponent::Enrollment,
         "token_gateway" => DeployComponent::TokenGateway,
         "competition_modules" => DeployComponent::CompetitionModules,
+        "dao_core" => DeployComponent::DaoCore,
         _ => return Command::Unknown,
     };
 
@@ -84,6 +86,7 @@ fn deploy(network: Network, component: DeployComponent) -> anyhow::Result<()> {
         DeployComponent::Enrollment => deploy_enrollment(daemon)?,
         DeployComponent::TokenGateway => deploy_token_gateway(daemon)?,
         DeployComponent::CompetitionModules => deploy_competition_modules(daemon)?,
+        DeployComponent::DaoCore => deploy_dao_core(daemon)?,
     }
 
     Ok(())
@@ -129,6 +132,12 @@ fn deploy_competition_modules(daemon: Daemon) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn deploy_dao_core(daemon: Daemon) -> anyhow::Result<()> {
+    let dao_core = DaoDaoCoreContract::new(daemon);
+    dao_core.upload()?;
+    Ok(())
+}
+
 mod arena;
 mod dao_dao;
 #[cfg(test)]
diff --git a/scripts/src/tests/arena_token_gateway.rs b/scripts/src/tests/arena_token_gateway.rs
index c4c000b..18bbb15 100644
--- a/scripts/src/tests/arena_token_gateway.rs
+++ b/scripts/src/tests/arena_token_gateway.rs
@@ -1,8 +1,10 @@
-use crate::tests::helpers::{setup_arena, setup_vesting};
-use arena_token_gateway::msg::{ApplyMsg, ExecuteMsgFns as _, QueryMsgFns as _};
-use cosmwasm_std::{coins, Decimal, Uint128};
+use crate::tests::helpers::{setup_arena, setup_vesting, setup_voting_module};
+use arena_token_gateway::msg::{ApplyMsg, ExecuteMsg, ExecuteMsgFns as _, QueryMsgFns as _};
+use cosmwasm_std::{coins, to_json_binary, CosmosMsg, Decimal, Uint128, WasmMsg};
+use cw4::Member;
 use cw_orch::{anyhow, prelude::*};
 use cw_payroll_factory::msg::QueryMsgFns as _;
+use dao_voting::{proposal::SingleChoiceProposeMsg, voting::SingleChoiceAutoVote};
 
 use super::{DENOM, PREFIX};
 
@@ -41,6 +43,14 @@ fn test_apply_and_accept_application() -> anyhow::Result<()> {
     let mock = MockBech32::new(PREFIX);
     let (mut arena, admin) = setup_arena(&mock)?;
     setup_vesting(&arena, mock.block_info()?.chain_id, &admin)?;
+    setup_voting_module(
+        &mock,
+        &arena,
+        vec![Member {
+            addr: admin.to_string(),
+            weight: 1,
+        }],
+    )?;
 
     mock.add_balance(
         &arena.dao_dao.dao_core.address()?,
@@ -85,12 +95,32 @@ fn test_apply_and_accept_application() -> anyhow::Result<()> {
     );
 
     // Accept the application with the upfront amount attached
-    arena
-        .arena_token_gateway
-        .set_sender(&arena.dao_dao.dao_core.address()?);
-    arena
-        .arena_token_gateway
-        .accept_application(1u128, &coins(100000, DENOM))?;
+    arena.dao_dao.dao_proposal_single.call_as(&admin).execute(
+        &dao_proposal_single::msg::ExecuteMsg::Propose(SingleChoiceProposeMsg {
+            title: "Accept token gateway application".to_owned(),
+            description: "Testing the token gateway application process with callback messages"
+                .to_owned(),
+            msgs: vec![CosmosMsg::Wasm(WasmMsg::Execute {
+                contract_addr: arena.arena_token_gateway.addr_str()?,
+                msg: to_json_binary(&ExecuteMsg::AcceptApplication {
+                    application_id: Uint128::one(),
+                })?,
+                funds: coins(100000, DENOM),
+            })],
+            proposer: None,
+            vote: Some(SingleChoiceAutoVote {
+                vote: dao_voting::voting::Vote::Yes,
+                rationale: None,
+            }),
+        }),
+        None,
+    )?;
+    let res = arena.dao_dao.dao_proposal_single.execute(
+        &dao_proposal_single::msg::ExecuteMsg::Execute { proposal_id: 1 },
+        None,
+    )?;
+    dbg!(res.events);
+    dbg!(arena.dao_dao.cw_payroll_factory.address()?);
 
     // Query the application again
     let updated_application = arena.arena_token_gateway.application(1u128)?;
@@ -112,13 +142,12 @@ fn test_apply_and_accept_application() -> anyhow::Result<()> {
         .cw_payroll_factory
         .set_address(&payroll_address);
 
-    let _vesting_contracts = arena
+    let vesting_contracts = arena
         .dao_dao
         .cw_payroll_factory
         .list_vesting_contracts(None, None)?;
 
-    // TODO: proposal execute data does not get picked up by the DAO atm
-    // assert!(!vesting_contracts.is_empty());
+    assert!(!vesting_contracts.is_empty());
 
     // Ensure token gateway balance is empty
     let gateway_balance = mock.query_balance(&arena.arena_token_gateway.address()?, DENOM)?;
diff --git a/scripts/src/tests/arena_wager_module.rs b/scripts/src/tests/arena_wager_module.rs
index 5a71c97..c8d43b5 100644
--- a/scripts/src/tests/arena_wager_module.rs
+++ b/scripts/src/tests/arena_wager_module.rs
@@ -13,6 +13,7 @@ use cw_balance::{
 use cw_orch::{anyhow, prelude::*};
 use cw_orch_clone_testing::CloneTesting;
 use cw_utils::Expiration;
+use dao_interface::CoreQueryMsgFns;
 use networks::PION_1;
 
 use crate::arena::Arena;
@@ -782,7 +783,7 @@ fn test_jailed_wager_resolved_by_dao() -> anyhow::Result<()> {
     let res = mock.call_as(&admin).execute(
         &dao_proposal_single::msg::ExecuteMsg::Execute { proposal_id: 1 },
         &[],
-        &arena.dao_dao.dao_proposal_single.address()?,
+        &arena.dao_dao.dao_core.proposal_modules(None, None)?[1].address,
     )?;
     dbg!(res);
 
diff --git a/scripts/src/tests/deploy.rs b/scripts/src/tests/deploy.rs
index 2d02f11..58428cb 100644
--- a/scripts/src/tests/deploy.rs
+++ b/scripts/src/tests/deploy.rs
@@ -78,14 +78,14 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                             msg: to_json_binary(&InstantiateMsg {
                                 deposit_info: None,
                                 submission_policy:
-                                    dao_voting_master::pre_propose::PreProposeSubmissionPolicy::Specific {
+                                    dao_voting::pre_propose::PreProposeSubmissionPolicy::Specific {
                                         dao_members: true,
                                         allowlist: vec![],
                                         denylist: vec![],
                                     },
                                 extension: InstantiateExt {
                                     competition_modules_instantiate_info: Some(vec![
-                                        dao_interface_master::state::ModuleInstantiateInfo {
+                                        dao_interface::state::ModuleInstantiateInfo {
                                             code_id: arena.arena_tournament_module.code_id()?,
                                             msg: to_json_binary(
                                                 &arena_tournament_module::msg::InstantiateMsg {
@@ -95,11 +95,11 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                                                     extension: Empty {},
                                                 },
                                             )?,
-                                            admin: Some(dao_interface_master::state::Admin::CoreModule {}),
+                                            admin: Some(dao_interface::state::Admin::CoreModule {}),
                                             label: "Tournament Module".to_string(),
                                             funds: vec![],
                                         },
-                                        dao_interface_master::state::ModuleInstantiateInfo {
+                                        dao_interface::state::ModuleInstantiateInfo {
                                             code_id: arena.arena_wager_module.code_id()?,
                                             msg: to_json_binary(
                                                 &arena_wager_module::msg::InstantiateMsg {
@@ -108,11 +108,11 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                                                     extension: Empty {},
                                                 },
                                             )?,
-                                            admin: Some(dao_interface_master::state::Admin::CoreModule {}),
+                                            admin: Some(dao_interface::state::Admin::CoreModule {}),
                                             label: "Wager Module".to_string(),
                                             funds: vec![],
                                         },
-                                        dao_interface_master::state::ModuleInstantiateInfo {
+                                        dao_interface::state::ModuleInstantiateInfo {
                                             code_id: arena.arena_league_module.code_id()?,
                                             msg: to_json_binary(
                                                 &arena_league_module::msg::InstantiateMsg {
@@ -122,7 +122,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                                                     extension: Empty {},
                                                 },
                                             )?,
-                                            admin: Some(dao_interface_master::state::Admin::CoreModule {}),
+                                            admin: Some(dao_interface::state::Admin::CoreModule {}),
                                             label: "League Module".to_string(),
                                             funds: vec![],
                                         },
@@ -142,7 +142,9 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                                         cw721_msg: None,
                                     },
                                     rating_period: Duration::Time(604800u64),
-                                    payment_registry: Some(arena.arena_payment_registry.addr_str()?),
+                                    payment_registry: Some(
+                                        arena.arena_payment_registry.addr_str()?,
+                                    ),
                                 },
                             })?,
                             admin: Some(Admin::CoreModule {}),
@@ -155,7 +157,25 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
                 })?,
                 admin: Some(Admin::CoreModule {}),
                 funds: vec![],
-                label: "proposal module".to_string(),
+                label: "Arena Core Proposal".to_string(),
+            },
+            ModuleInstantiateInfo {
+                code_id: arena.dao_dao.dao_proposal_single.code_id()?,
+                msg: to_json_binary(&dao_proposal_single::msg::InstantiateMsg {
+                    threshold: Threshold::AbsolutePercentage {
+                        percentage: dao_voting::threshold::PercentageThreshold::Majority {},
+                    },
+                    max_voting_period: Duration::Height(10),
+                    min_voting_period: None,
+                    only_members_execute: false,
+                    allow_revoting: false,
+                    pre_propose_info: dao_voting::pre_propose::PreProposeInfo::AnyoneMayPropose {},
+                    close_proposal_on_execution_failure: true,
+                    veto: None,
+                })?,
+                admin: Some(Admin::CoreModule {}),
+                funds: vec![],
+                label: "DAO Proposal Single".to_string(),
             },
         ];
 
@@ -182,7 +202,7 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
         arena
             .dao_dao
             .dao_proposal_sudo
-            .set_address(&proposal_modules[1].address);
+            .set_address(&proposal_modules[2].address);
         arena
             .dao_dao
             .dao_proposal_single
@@ -244,6 +264,8 @@ impl<Chain: CwEnv> cw_orch::contract::Deploy<Chain> for Arena<Chain> {
             Box::new(&mut self.arena_league_module),
             Box::new(&mut self.arena_escrow),
             Box::new(&mut self.arena_competition_enrollment),
+            Box::new(&mut self.arena_token_gateway),
+            Box::new(&mut self.arena_payment_registry),
         ]
     }
 }
diff --git a/scripts/state.json b/scripts/state.json
index 3cdfe73..8b97a2e 100644
--- a/scripts/state.json
+++ b/scripts/state.json
@@ -20,7 +20,8 @@
         "arena_payment_registry": 6405,
         "arena_token_gateway": 6604,
         "arena_tournament_module": 6454,
-        "arena_wager_module": 6452
+        "arena_wager_module": 6452,
+        "dao_dao_core": 6605
       },
       "default": {}
     }