diff --git a/.env.development b/.env.development
index ff6e9e9c..a960cac6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,2 @@
 JUNO_URL=http://localhost:5173
-CONTAINER_URL=http://127.0.0.1:5987
 CLI_PROJECT_NAME=juno-dev
\ No newline at end of file
diff --git a/src/api/actor.api.ts b/src/api/actor.api.ts
index 1cb66126..38cb9b70 100644
--- a/src/api/actor.api.ts
+++ b/src/api/actor.api.ts
@@ -3,6 +3,7 @@ import {isNullish, nonNullish} from '@dfinity/utils';
 import {type ActorParameters} from '@junobuild/admin';
 import {red} from 'kleur';
 import {getToken} from '../configs/cli.config';
+import {ENV} from '../env';
 import {getProcessToken} from '../utils/process.utils';
 import {initAgent} from './agent.api';
 
@@ -20,7 +21,7 @@ export const actorParameters = async (): Promise<
 
   const params: Omit<ActorParameters, 'agent'> = {
     identity,
-    ...(nonNullish(process.env.CONTAINER_URL) && {container: process.env.CONTAINER_URL})
+    ...(nonNullish(ENV.containerUrl) && {container: ENV.containerUrl})
   };
 
   const agent = await initAgent(params);
diff --git a/src/env.ts b/src/env.ts
index 785d6a01..92928bf2 100644
--- a/src/env.ts
+++ b/src/env.ts
@@ -2,7 +2,7 @@ import {nextArg} from '@junobuild/cli-tools';
 import type {JunoConfigEnv} from '@junobuild/config';
 
 export type JunoCliEnv = JunoConfigEnv & {
-  containerUrl?: string;
+  containerUrl: string | undefined;
 };
 
 const loadEnv = (): JunoCliEnv => {
@@ -13,8 +13,10 @@ const loadEnv = (): JunoCliEnv => {
 
   return {
     mode: mode ?? 'production',
-    containerUrl: containerUrl ?? (mode === 'development' ? 'http://127.0.0.1:5987' : '')
+    containerUrl: containerUrl ?? (mode === 'development' ? 'http://127.0.0.1:5987' : undefined)
   };
 };
 
 export const ENV = loadEnv();
+
+export const DEV = ENV.mode === 'development';
diff --git a/src/services/functions/upgrade/upgrade.cdn.services.ts b/src/services/functions/upgrade/upgrade.cdn.services.ts
index 8772c9b3..59b54cde 100644
--- a/src/services/functions/upgrade/upgrade.cdn.services.ts
+++ b/src/services/functions/upgrade/upgrade.cdn.services.ts
@@ -3,6 +3,7 @@ import {assertAnswerCtrlC, hasArgs, nextArg} from '@junobuild/cli-tools';
 import {yellow} from 'kleur';
 import prompts from 'prompts';
 import {CDN_RELEASES_FULL_PATH} from '../../../constants/functions.constants';
+import {ENV} from '../../../env';
 import {type SatelliteParametersWithId} from '../../../types/satellite';
 import {defaultSatelliteDomain} from '../../../utils/domain.utils';
 import {logUpgradeResult} from '../../../utils/upgrade.utils';
@@ -29,7 +30,7 @@ export const upgradeWithCdn = async ({
   const customHost = URL.parse(defaultSatelliteDomain(satellite.satelliteId))?.hostname;
 
   const cdn = {
-    url: process.env.CONTAINER_URL ?? defaultSatelliteDomain(satellite.satelliteId),
+    url: ENV.containerUrl ?? defaultSatelliteDomain(satellite.satelliteId),
     path: fullPath,
     ...(nonNullish(customHost) && {customHost})
   };
diff --git a/src/utils/domain.utils.ts b/src/utils/domain.utils.ts
index 558780e7..3fd5465f 100644
--- a/src/utils/domain.utils.ts
+++ b/src/utils/domain.utils.ts
@@ -1,9 +1,11 @@
 import {nonNullish} from '@dfinity/utils';
 import {CONSOLE_SATELLITE_URL} from '../constants/constants';
+import {DEV, ENV} from '../env';
 
 export const defaultSatelliteDomain = (satelliteId: string): string => {
-  if (nonNullish(process.env.CONTAINER_URL)) {
-    return `http://${satelliteId}.${process.env.CONTAINER_URL.replace('http://127.0.0.1', 'localhost')}`;
+  if (DEV && nonNullish(ENV.containerUrl)) {
+    const url = URL.parse(ENV.containerUrl);
+    return `${url?.protocol ?? 'http:'}//${satelliteId}.${(url?.host ?? '127.0.0.1:5987').replace('127.0.0.1', 'localhost')}`;
   }
 
   return `https://${satelliteId}.icp0.io`;