diff --git a/Makefile b/Makefile
index bd45c29..7e854cb 100644
--- a/Makefile
+++ b/Makefile
@@ -333,7 +333,7 @@
 	else \
 	        helm repo update; \
 	fi
-	NODE_IP=${NODE_IP} DATA_IFACE=${DATA_IFACE} RAN_SUBNET=${RAN_SUBNET} envsubst < $(5G_CORE_VALUES) | \
+	NODE_IP=${NODE_IP} DATA_IFACE=${DATA_IFACE} RAN_SUBNET=${RAN_SUBNET} ENABLE_GNBSIM=${ENABLE_GNBSIM} envsubst < $(5G_CORE_VALUES) | \
 	helm upgrade --create-namespace --install --wait $(HELM_GLOBAL_ARGS) \
 		--namespace omec \
 		--values - \
diff --git a/aether-2.0/sd-core-5g-values.yaml b/aether-2.0/sd-core-5g-values.yaml
index fae56ab..8753043 100644
--- a/aether-2.0/sd-core-5g-values.yaml
+++ b/aether-2.0/sd-core-5g-values.yaml
@@ -162,7 +162,7 @@
             hostname: "upf"
 
 5g-ran-sim:
-  enable: true
+  enable: ${ENABLE_GNBSIM}
   resources:
     enabled: false
   images:
diff --git a/sd-core-5g-values.yaml b/sd-core-5g-values.yaml
index 187bcca..81b2faf 100644
--- a/sd-core-5g-values.yaml
+++ b/sd-core-5g-values.yaml
@@ -162,7 +162,7 @@
             hostname: "upf"
 
 5g-ran-sim:
-  enable: true
+  enable: ${ENABLE_GNBSIM}
   resources:
     enabled: false
   images: