diff --git a/Cargo.lock b/Cargo.lock
index abbddd19..de9793b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1202,9 +1202,9 @@ dependencies = [
 
 [[package]]
 name = "canhttp"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a904573d46c342d81fc9d07e9f5dad0af53ece2831cb9651bd5fe8dee673ea"
+checksum = "13f7072785f309714ab665889c3c73c9d64d976fdc02b8cadb9de13799f69053"
 dependencies = [
  "assert_matches",
  "ciborium",
@@ -1213,7 +1213,6 @@ dependencies = [
  "http",
  "ic-cdk",
  "ic-error-types",
- "ic-management-canister-types",
  "num-traits",
  "pin-project",
  "serde",
@@ -1719,7 +1718,6 @@ dependencies = [
  "evm_rpc_types",
  "ic-cdk",
  "ic-cdk-bindgen",
- "ic-cdk-macros 0.17.2",
  "ic-certified-map",
  "serde",
  "serde_bytes",
@@ -1956,7 +1954,8 @@ dependencies = [
  "ic-error-types",
  "ic-ethereum-types",
  "ic-http-types",
- "ic-management-canister-types",
+ "ic-management-canister-types 0.3.3",
+ "ic-management-canister-types 0.5.0",
  "ic-metrics-assert",
  "ic-metrics-encoder",
  "ic-stable-structures",
@@ -2012,7 +2011,7 @@ dependencies = [
  "canlog",
  "hex",
  "ic-error-types",
- "ic-management-canister-types",
+ "ic-management-canister-types 0.5.0",
  "num-bigint",
  "proptest",
  "serde",
@@ -2524,16 +2523,17 @@ dependencies = [
 
 [[package]]
 name = "ic-cdk"
-version = "0.18.7"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4efb278f5d3ef033b3eed7f01f1096eaf67701896aa5ef69f5eddf5a84833dc0"
+checksum = "818d6d5416a8f0212e1b132703b0da51e36c55f2b96677e96f2bbe7702e1bd85"
 dependencies = [
  "candid",
  "ic-cdk-executor",
- "ic-cdk-macros 0.18.7",
+ "ic-cdk-macros",
  "ic-error-types",
- "ic-management-canister-types",
+ "ic-management-canister-types 0.5.0",
  "ic0",
+ "pin-project-lite",
  "serde",
  "serde_bytes",
  "slotmap",
@@ -2551,33 +2551,20 @@ dependencies = [
 
 [[package]]
 name = "ic-cdk-executor"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99f4ee8930fd2e491177e2eb7fff53ee1c407c13b9582bdc7d6920cf83109a2d"
+checksum = "33716b730ded33690b8a704bff3533fda87d229e58046823647d28816e9bcee7"
 dependencies = [
  "ic0",
  "slotmap",
+ "smallvec",
 ]
 
 [[package]]
 name = "ic-cdk-macros"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84cbaa50fa36d3e0616114becf81faa95a099e0d60948ed6978f30f1c77399fd"
-dependencies = [
- "candid",
- "proc-macro2",
- "quote",
- "serde",
- "serde_tokenstream",
- "syn 2.0.108",
-]
-
-[[package]]
-name = "ic-cdk-macros"
-version = "0.18.7"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb14c5d691cc9d72bb95459b4761e3a4b3444b85a63d17555d5ddd782969a1e"
+checksum = "66dad91a214945cb3605bc9ef6901b87e2ac41e3624284c2cabba49d43aa4f43"
 dependencies = [
  "candid",
  "darling 0.20.11",
@@ -2665,6 +2652,17 @@ dependencies = [
  "serde_bytes",
 ]
 
+[[package]]
+name = "ic-management-canister-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3149217e24186df3f13dc45eee14cdb3e5cad07d0b2b67bd53555c1c55462957"
+dependencies = [
+ "candid",
+ "serde",
+ "serde_bytes",
+]
+
 [[package]]
 name = "ic-metrics-assert"
 version = "0.1.1"
@@ -2674,7 +2672,7 @@ dependencies = [
  "async-trait",
  "candid",
  "ic-http-types",
- "ic-management-canister-types",
+ "ic-management-canister-types 0.3.3",
  "pocket-ic",
  "regex",
  "serde",
@@ -3599,7 +3597,7 @@ dependencies = [
  "flate2",
  "hex",
  "ic-certification",
- "ic-management-canister-types",
+ "ic-management-canister-types 0.3.3",
  "ic-transport-types",
  "reqwest",
  "schemars 0.8.22",
@@ -4479,18 +4477,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "serde_tokenstream"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
diff --git a/Cargo.toml b/Cargo.toml
index 77fba3b7..ae419743 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ candid_parser = { workspace = true }
 evm_rpc_client = { path = "evm_rpc_client", features = ["alloy"] }
 ic-crypto-test-utils-reproducible-rng = { git = "https://github.com/dfinity/ic", rev = "release-2024-09-26_01-31-base" }
 ic-error-types = { workspace = true }
-ic-management-canister-types = { workspace = true }
+ic-management-canister-types-pocket-ic = { package = "ic-management-canister-types", version = "0.3" }
 ic-metrics-assert = { workspace = true }
 ic-test-utilities-load-wasm = { git = "https://github.com/dfinity/ic", rev = "release-2024-09-26_01-31-base" }
 maplit = { workspace = true }
@@ -77,7 +77,7 @@ alloy-rpc-types = "1.0.23"
 assert_matches = "1.5.0"
 async-trait = "0.1.88"
 candid = { version = "0.10.13" }
-canhttp = { version = "0.3.0", features = ["json", "multi"] }
+canhttp = { version = "0.4.0", features = ["json", "multi"] }
 canlog = { version = "0.2.0", features = ["derive"] }
 candid_parser = { version = "0.1.4" }
 derive_more = { version = "2.0.1", features = ["from", "into"] }
@@ -86,14 +86,13 @@ ethnum = { version = "1.5.0", features = ["serde"] }
 getrandom = { version = "0.2", features = ["custom"] }
 hex = "0.4.3"
 http = "1.3.1"
-ic-cdk = "0.18.7"
+ic-cdk = "0.19.0"
 ic-cdk-bindgen = "0.1"
-ic-cdk-macros = "0.17.2"
 ic-certified-map = "0.4"
 ic-http-types = "0.1.0"
 ic-error-types = "0.2"
 ic-ethereum-types = "1.0.0"
-ic-management-canister-types = "0.3"
+ic-management-canister-types = "0.5.0"
 ic-metrics-assert = { version = "0.1.1", features = ["pocket_ic"] }
 ic-metrics-encoder = "1.1"
 ic-stable-structures = "0.6.8"
diff --git a/e2e/rust/Cargo.toml b/e2e/rust/Cargo.toml
index 976fed04..1d7c8c86 100644
--- a/e2e/rust/Cargo.toml
+++ b/e2e/rust/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 candid = { workspace = true }
 ic-certified-map = { workspace = true }
 ic-cdk = { workspace = true }
-ic-cdk-macros = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
 evm_rpc_types = { path = "../../evm_rpc_types" }
diff --git a/src/http.rs b/src/http.rs
index 128578e0..f68b9359 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -31,11 +31,11 @@ use evm_rpc_types::{
     ValidationError,
 };
 use http::{header::CONTENT_TYPE, HeaderValue};
-use ic_error_types::RejectCode;
-use ic_management_canister_types::{
+use ic_cdk::management_canister::{
     HttpRequestArgs as IcHttpRequest, HttpRequestResult as IcHttpResponse, TransformArgs,
     TransformContext, TransformFunc,
 };
+use ic_error_types::RejectCode;
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::Debug;
 use thiserror::Error;
diff --git a/src/main.rs b/src/main.rs
index 22f842f9..f44d6e81 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,11 +17,11 @@ use evm_rpc::{
     types::{OverrideProvider, Provider, ProviderId, RpcAccess, RpcAuth},
 };
 use evm_rpc_types::{Hex32, HttpOutcallError, MultiRpcResult, RpcConfig, RpcResult, RpcServices};
-use ic_cdk::{api::is_controller, query, update};
-use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
-use ic_management_canister_types::{
+use ic_cdk::management_canister::{
     HttpRequestArgs as IcHttpRequest, HttpRequestResult as IcHttpResponse, TransformArgs,
 };
+use ic_cdk::{api::is_controller, query, update};
+use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
 use ic_metrics_encoder::MetricsEncoder;
 use std::str::FromStr;
 use tower::Service;
diff --git a/src/rpc_client/mod.rs b/src/rpc_client/mod.rs
index 738ff8a5..833212a9 100644
--- a/src/rpc_client/mod.rs
+++ b/src/rpc_client/mod.rs
@@ -27,7 +27,7 @@ use evm_rpc_types::{
     RpcService, RpcServices,
 };
 use http::{Request, Response};
-use ic_management_canister_types::{
+use ic_cdk::management_canister::{
     HttpRequestArgs as IcHttpRequest, TransformContext, TransformFunc,
 };
 use json::{
diff --git a/tests/setup/mod.rs b/tests/setup/mod.rs
index 9394d855..c031cb32 100644
--- a/tests/setup/mod.rs
+++ b/tests/setup/mod.rs
@@ -14,8 +14,8 @@ use evm_rpc::{
 use evm_rpc_client::{AlloyResponseConverter, ClientBuilder, EvmRpcClient, NoRetry, Runtime};
 use evm_rpc_types::{InstallArgs, Provider, RpcResult, RpcService};
 use ic_http_types::{HttpRequest, HttpResponse};
-use ic_management_canister_types::CanisterId;
-use ic_management_canister_types::CanisterSettings;
+use ic_management_canister_types_pocket_ic::CanisterId;
+use ic_management_canister_types_pocket_ic::CanisterSettings;
 use ic_metrics_assert::{MetricsAssert, PocketIcAsyncHttpQuery};
 use ic_test_utilities_load_wasm::load_wasm;
 use num_traits::ToPrimitive;