diff --git a/src/api/actor.api.ts b/src/api/actor.api.ts
index fb3399fc..9a67105d 100644
--- a/src/api/actor.api.ts
+++ b/src/api/actor.api.ts
@@ -1,5 +1,5 @@
-import {Ed25519KeyIdentity} from '@dfinity/identity';
 import {isNullish, nonNullish, notEmptyString} from '@dfinity/utils';
+import {Ed25519KeyIdentity} from '@icp-sdk/core/identity';
 import type {ActorParameters} from '@junobuild/ic-client/actor';
 import {green, red, yellow} from 'kleur';
 import {getToken} from '../configs/cli.config';
diff --git a/src/api/agent.api.ts b/src/api/agent.api.ts
index 8a62e775..56a9cdd9 100644
--- a/src/api/agent.api.ts
+++ b/src/api/agent.api.ts
@@ -1,5 +1,5 @@
-import {HttpAgent} from '@dfinity/agent';
 import {isNullish, nonNullish} from '@dfinity/utils';
+import {HttpAgent} from '@icp-sdk/core/agent';
 import type {ActorParameters} from '@junobuild/ic-client/actor';
 import {REVOKED_CONTROLLERS} from '../constants/constants';
 import {actorParameters} from './actor.api';
diff --git a/src/api/ic.api.ts b/src/api/ic.api.ts
index 6c495297..706154ec 100644
--- a/src/api/ic.api.ts
+++ b/src/api/ic.api.ts
@@ -9,8 +9,8 @@ import {
   type upload_canister_snapshot_metadata_response,
   type UploadCanisterSnapshotDataParams,
   type UploadCanisterSnapshotMetadataParams
-} from '@dfinity/ic-management';
-import type {Principal} from '@dfinity/principal';
+} from '@icp-sdk/canisters/ic-management';
+import type {Principal} from '@icp-sdk/core/principal';
 import {initAgent} from './agent.api';
 
 export const canisterStop = async ({canisterId}: {canisterId: Principal}): Promise<void> => {
diff --git a/src/commands/auth.ts b/src/commands/auth.ts
index 92596ad9..e39da0f5 100644
--- a/src/commands/auth.ts
+++ b/src/commands/auth.ts
@@ -1,5 +1,5 @@
-import {Ed25519KeyIdentity} from '@dfinity/identity';
 import {isNullish} from '@dfinity/utils';
+import {Ed25519KeyIdentity} from '@icp-sdk/core/identity';
 import {assertAnswerCtrlC, hasArgs} from '@junobuild/cli-tools';
 import {green, red} from 'kleur';
 import prompts from 'prompts';
diff --git a/src/commands/whoami.ts b/src/commands/whoami.ts
index cd96b90d..d363bf31 100644
--- a/src/commands/whoami.ts
+++ b/src/commands/whoami.ts
@@ -1,5 +1,5 @@
-import {Ed25519KeyIdentity} from '@dfinity/identity';
 import {isNullish, nonNullish} from '@dfinity/utils';
+import {Ed25519KeyIdentity} from '@icp-sdk/core/identity';
 import {green} from 'kleur';
 import {getToken} from '../configs/cli.config';
 import {ENV} from '../env';
diff --git a/src/configs/cli.config.ts b/src/configs/cli.config.ts
index 6c999d18..b4ecb53e 100644
--- a/src/configs/cli.config.ts
+++ b/src/configs/cli.config.ts
@@ -1,5 +1,5 @@
-import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
 import {assertNonNullish, nonNullish} from '@dfinity/utils';
+import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity';
 import type Conf from 'conf';
 import {red, yellow} from 'kleur';
 import {askForPassword} from '../services/cli.settings.services';
diff --git a/src/services/auth/login.services.ts b/src/services/auth/login.services.ts
index 8968b2ce..7d2ee734 100644
--- a/src/services/auth/login.services.ts
+++ b/src/services/auth/login.services.ts
@@ -1,4 +1,4 @@
-import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
+import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity';
 import {nextArg} from '@junobuild/cli-tools';
 import {bold, green, underline} from 'kleur';
 import {randomBytes} from 'node:crypto';
diff --git a/src/services/config/settings.services.ts b/src/services/config/settings.services.ts
index 1c435bd7..ea0eb8b5 100644
--- a/src/services/config/settings.services.ts
+++ b/src/services/config/settings.services.ts
@@ -1,6 +1,6 @@
-import {ICManagementCanister, LogVisibility} from '@dfinity/ic-management';
-import {Principal} from '@dfinity/principal';
 import {isNullish} from '@dfinity/utils';
+import {ICManagementCanister, LogVisibility} from '@icp-sdk/canisters/ic-management';
+import {Principal} from '@icp-sdk/core/principal';
 import type {ModuleSettings} from '@junobuild/config';
 import {initAgent} from '../../api/agent.api';
 import type {SatelliteParametersWithId} from '../../types/satellite';
diff --git a/src/services/controllers.services.ts b/src/services/controllers.services.ts
index 9a8ef924..28443076 100644
--- a/src/services/controllers.services.ts
+++ b/src/services/controllers.services.ts
@@ -1,4 +1,4 @@
-import {type Principal} from '@dfinity/principal';
+import {type Principal} from '@icp-sdk/core/principal';
 import {assertAnswerCtrlC} from '@junobuild/cli-tools';
 import {bold, green, red} from 'kleur';
 import prompts from 'prompts';
diff --git a/src/services/modules/snapshot/_snapshot.loader.services.ts b/src/services/modules/snapshot/_snapshot.loader.services.ts
index 687b6c1f..5920c0af 100644
--- a/src/services/modules/snapshot/_snapshot.loader.services.ts
+++ b/src/services/modules/snapshot/_snapshot.loader.services.ts
@@ -1,7 +1,7 @@
-import type {snapshot_id} from '@dfinity/ic-management';
-import {encodeSnapshotId} from '@dfinity/ic-management';
-import {type Principal} from '@dfinity/principal';
 import {isNullish, nonNullish} from '@dfinity/utils';
+import type {snapshot_id} from '@icp-sdk/canisters/ic-management';
+import {encodeSnapshotId} from '@icp-sdk/canisters/ic-management';
+import {type Principal} from '@icp-sdk/core/principal';
 import {red} from 'kleur';
 import ora from 'ora';
 import {listCanisterSnapshots} from '../../../api/ic.api';
diff --git a/src/services/modules/snapshot/snapshot.download.services.ts b/src/services/modules/snapshot/snapshot.download.services.ts
index d12ac0e8..f7d9cd4f 100644
--- a/src/services/modules/snapshot/snapshot.download.services.ts
+++ b/src/services/modules/snapshot/snapshot.download.services.ts
@@ -1,9 +1,9 @@
+import {arrayOfNumberToUint8Array, jsonReplacer} from '@dfinity/utils';
 import {
   type CanisterSnapshotMetadataKind,
   type ReadCanisterSnapshotMetadataResponse,
   encodeSnapshotId
-} from '@dfinity/ic-management';
-import {arrayOfNumberToUint8Array, jsonReplacer} from '@dfinity/utils';
+} from '@icp-sdk/canisters/ic-management';
 import {red} from 'kleur';
 import {createHash} from 'node:crypto';
 import {createWriteStream, existsSync, statSync} from 'node:fs';
diff --git a/src/services/modules/snapshot/snapshot.services.ts b/src/services/modules/snapshot/snapshot.services.ts
index 80cf166a..951d9f40 100644
--- a/src/services/modules/snapshot/snapshot.services.ts
+++ b/src/services/modules/snapshot/snapshot.services.ts
@@ -1,7 +1,7 @@
-import type {snapshot_id} from '@dfinity/ic-management';
-import {encodeSnapshotId} from '@dfinity/ic-management';
-import {Principal} from '@dfinity/principal';
 import {notEmptyString} from '@dfinity/utils';
+import type {snapshot_id} from '@icp-sdk/canisters/ic-management';
+import {encodeSnapshotId} from '@icp-sdk/canisters/ic-management';
+import {Principal} from '@icp-sdk/core/principal';
 import {nextArg} from '@junobuild/cli-tools';
 import ora from 'ora';
 import {
diff --git a/src/services/modules/snapshot/snapshot.upload.services.ts b/src/services/modules/snapshot/snapshot.upload.services.ts
index ba9bfe0e..6768d83a 100644
--- a/src/services/modules/snapshot/snapshot.upload.services.ts
+++ b/src/services/modules/snapshot/snapshot.upload.services.ts
@@ -1,9 +1,9 @@
+import {arrayBufferToUint8Array, isNullish, jsonReviver} from '@dfinity/utils';
 import {
   encodeSnapshotId,
   type snapshot_id,
   type UploadCanisterSnapshotDataKind
-} from '@dfinity/ic-management';
-import {arrayBufferToUint8Array, isNullish, jsonReviver} from '@dfinity/utils';
+} from '@icp-sdk/canisters/ic-management';
 import {red} from 'kleur';
 import {lstatSync} from 'node:fs';
 import {type FileHandle, open as openFile, readFile} from 'node:fs/promises';
diff --git a/src/services/modules/start-stop.services.ts b/src/services/modules/start-stop.services.ts
index 214c85ba..41feedf6 100644
--- a/src/services/modules/start-stop.services.ts
+++ b/src/services/modules/start-stop.services.ts
@@ -1,5 +1,5 @@
-import {Principal} from '@dfinity/principal';
 import {isNullish} from '@dfinity/utils';
+import {Principal} from '@icp-sdk/core/principal';
 import {cyan, red} from 'kleur';
 import ora from 'ora';
 import {canisterStart, canisterStop} from '../../api/ic.api';
diff --git a/src/services/run.services.ts b/src/services/run.services.ts
index 7bd45659..6d5400a0 100644
--- a/src/services/run.services.ts
+++ b/src/services/run.services.ts
@@ -1,5 +1,5 @@
-import {Principal} from '@dfinity/principal';
 import {assertNonNullish, isNullish, nonNullish} from '@dfinity/utils';
+import {Principal} from '@icp-sdk/core/principal';
 import {buildScript, nextArg} from '@junobuild/cli-tools';
 import {OnRunSchema, type RunFnOrObject, RunFnOrObjectSchema} from '@junobuild/config';
 import {red, yellow} from 'kleur';
diff --git a/src/types/cli.config.ts b/src/types/cli.config.ts
index 47df98b8..4ea87344 100644
--- a/src/types/cli.config.ts
+++ b/src/types/cli.config.ts
@@ -1,5 +1,5 @@
-import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
 import type {PrincipalText} from '@dfinity/zod-schemas';
+import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity';
 
 export interface CliConfig {
   token: JsonnableEd25519KeyIdentity;
diff --git a/src/types/snapshot.ts b/src/types/snapshot.ts
index ecf8cd3b..bc283268 100644
--- a/src/types/snapshot.ts
+++ b/src/types/snapshot.ts
@@ -1,5 +1,5 @@
-import type {snapshot_id} from '@dfinity/ic-management';
-import type {Principal} from '@dfinity/principal';
+import type {snapshot_id} from '@icp-sdk/canisters/ic-management';
+import type {Principal} from '@icp-sdk/core/principal';
 import type * as z from 'zod';
 import {
   type ReadCanisterSnapshotMetadataResponseSchema,
diff --git a/src/utils/auth.utils.ts b/src/utils/auth.utils.ts
index e0487119..a4dadf99 100644
--- a/src/utils/auth.utils.ts
+++ b/src/utils/auth.utils.ts
@@ -1,7 +1,7 @@
-import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
-import {Ed25519KeyIdentity} from '@dfinity/identity';
 import {nonNullish} from '@dfinity/utils';
 import type {PrincipalText} from '@dfinity/zod-schemas';
+import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity';
+import {Ed25519KeyIdentity} from '@icp-sdk/core/identity';
 import {REDIRECT_URL} from '../constants/constants';
 import {ENV} from '../env';
 
diff --git a/src/utils/process.utils.ts b/src/utils/process.utils.ts
index b842b155..21a82e7c 100644
--- a/src/utils/process.utils.ts
+++ b/src/utils/process.utils.ts
@@ -1,4 +1,4 @@
-import type {JsonnableEd25519KeyIdentity} from '@dfinity/identity';
+import type {JsonnableEd25519KeyIdentity} from '@icp-sdk/core/identity';
 import {hasArgs} from '@junobuild/cli-tools';
 
 export const getProcessToken = (): JsonnableEd25519KeyIdentity | undefined => {