diff --git a/Cargo.lock b/Cargo.lock
index 901d5cd..e1f95aa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -179,18 +179,17 @@ dependencies = [
 
 [[package]]
 name = "astroport-factory"
-version = "1.7.0"
+version = "1.8.0-rc.2-tokenfactory"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc4250f45bd4697476921a3533f151a73f7352c271b68ff411321006d5a4977"
+checksum = "799b8c9d77524d776fe5e5d0eed4fa9278dc78ce603aad5a361606a35f45f360"
 dependencies = [
- "astroport 3.11.1",
+ "astroport 5.0.0-rc.2-tokenfactory",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-storage-plus 0.15.1",
+ "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
- "cw2 0.15.1",
- "itertools 0.10.5",
- "protobuf",
+ "cw2 1.1.2",
+ "itertools 0.12.1",
  "thiserror",
 ]
 
@@ -226,23 +225,6 @@ dependencies = [
  "cw20 0.15.1",
 ]
 
-[[package]]
-name = "astroport-incentives"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e24d90a13953fe8c34aadc0919ce2f148772fe609bb7480a6615a54dcc9780"
-dependencies = [
- "astroport 3.11.1",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 1.0.3",
- "cw2 1.1.2",
- "cw20 1.1.2",
- "itertools 0.11.0",
- "thiserror",
-]
-
 [[package]]
 name = "astroport-maker"
 version = "1.4.0"
@@ -294,19 +276,21 @@ dependencies = [
 
 [[package]]
 name = "astroport-pair-concentrated"
-version = "1.2.13"
+version = "4.0.0-rc.1-tokenfactory"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a25c6ccbeccd25d36706621db915b67ca5d919e192fb06d7dd35cf69152d84"
+checksum = "f831ebe18472f6e9ba7a754eaaa09a389b7bcbc909d1d7b5314bf2092a18719b"
 dependencies = [
- "astroport 2.9.5",
+ "astroport 5.0.0-rc.2-tokenfactory",
+ "astroport-circular-buffer 0.2.0",
  "astroport-factory",
+ "astroport-pcl-common",
  "cosmwasm-schema",
  "cosmwasm-std",
- "cw-storage-plus 0.15.1",
- "cw-utils 0.15.1",
- "cw2 0.15.1",
- "cw20 0.15.1",
- "itertools 0.10.5",
+ "cw-storage-plus 1.2.0",
+ "cw-utils 1.0.3",
+ "cw2 1.1.2",
+ "cw20 1.1.2",
+ "itertools 0.12.1",
  "thiserror",
 ]
 
@@ -328,6 +312,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "astroport-pcl-common"
+version = "2.0.0-rc.2-tokenfactory"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "068cdc3b7f521f8abd4a7587da3f22219c1c8142e7508166a7f6c2c928470941"
+dependencies = [
+ "astroport 5.0.0-rc.2-tokenfactory",
+ "astroport-factory",
+ "cosmwasm-schema",
+ "cosmwasm-std",
+ "cw-storage-plus 1.2.0",
+ "cw20 1.1.2",
+ "itertools 0.12.1",
+ "thiserror",
+]
+
 [[package]]
 name = "astroport-router"
 version = "1.2.1"
@@ -912,7 +912,6 @@ dependencies = [
  "astroport 5.0.0-rc.2-tokenfactory",
  "astroport-factory",
  "astroport-generator",
- "astroport-incentives",
  "astroport-maker",
  "astroport-native-coin-registry",
  "astroport-pair",
diff --git a/Cargo.toml b/Cargo.toml
index a4418a7..8f6029e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,7 +53,6 @@ astroport-multi-test = [
   "astroport-vesting",
   "astroport-whitelist",
   "astroport-pair-concentrated",
-  "astroport-incentives"
 ]
 osmosis-test-tube = ["dep:osmosis-test-tube"]
 
@@ -97,7 +96,7 @@ cw20 = { version = "0.15", optional = true }
 # Astroport contracts for multi-test
 astroport-token = { version = "=1.1.1", optional = true, features = ["library"] }
 astroport-native-coin-registry = { version = "=1.0.1", optional = true, features = ["library"] }
-astroport-factory = { version = "=1.7.0", optional = true, features = ["library"] }
+astroport-factory = { version = "=1.8.0-rc.2-tokenfactory", optional = true, features = ["library"] }
 astroport-generator = { version = "=2.3.2", optional = true }
 astroport-maker = { version = "=1.4.0", optional = true }
 astroport-pair-stable = { version = "=4.0.0-rc.1-tokenfactory", optional = true, features = ["library"] }
@@ -106,8 +105,7 @@ astroport-router = { version = "=1.2.1", optional = true }
 astroport-staking = { version = "=1.1.0", optional = true }
 astroport-vesting = { version = "=1.3.2", optional = true, features = ["library"] }
 astroport-whitelist = { version = "=1.0.1", optional = true, features = ["library"] }
-astroport-pair-concentrated = { version = "=1.2.13", optional = true, features = ["library"] }
-astroport-incentives = { version = "=1.0.1", optional = true, features = ["library"] }
+astroport-pair-concentrated = { version = "=4.0.0-rc.1-tokenfactory", optional = true, features = ["library"] }
 
 # Osmosis deps
 proptest     = { version = "1.0.0", optional = true }