diff --git a/deploy/Chart.lock b/deploy/Chart.lock
index de0168ff..725a6d88 100644
--- a/deploy/Chart.lock
+++ b/deploy/Chart.lock
@@ -11,5 +11,8 @@ dependencies:
 - name: api-service
   repository: file://./api-service
   version: 0.0.1
-digest: sha256:1f01dff06c6132524b527accdcfd47083224855e2104c7b53773cc4fcac9ebf4
-generated: "2025-12-11T15:05:52.740323+08:00"
+- name: api-service
+  repository: file://./api-service
+  version: 0.0.1
+digest: sha256:d8cde747fdada74e8ef391a9dba4b459469d7854454856888eab3bb97c8e2fa7
+generated: "2026-02-27T16:59:03.91986+08:00"
diff --git a/deploy/api-service/templates/_helpers.tpl b/deploy/api-service/templates/_helpers.tpl
index 8c3f63d9..f4934f88 100644
--- a/deploy/api-service/templates/_helpers.tpl
+++ b/deploy/api-service/templates/_helpers.tpl
@@ -39,7 +39,7 @@ Selector labels
     {{ if .Values.backendAddr }}
         {{- .Values.backendAddr -}}
     {{ else }}
-        {{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.metadata.namespace -}}
+        {{- printf "http://envhub.%s.svc.cluster.local:8083" .Values.global.namespace -}}
     {{ end }}
 {{ end }}
 
@@ -47,7 +47,7 @@ Selector labels
     {{ if .Values.scheduleAddr }}
         {{- .Values.scheduleAddr -}}
     {{ else }}
-        {{- printf "http://controller.%s.svc.cluster.local:8080" .Values.metadata.namespace -}}
+        {{- printf "http://controller.%s.svc.cluster.local:8080" .Values.global.namespace -}}
     {{ end }}
 {{ end }}
 
@@ -55,12 +55,10 @@ Selector labels
     {{ if .Values.scheduleType }}
         {{- .Values.scheduleType -}}
     {{ else }}
-        {{- printf "k8s" .Values.metadata.namespace -}}
+        {{- printf "k8s" -}}
     {{ end }}
 {{ end }}
 
 {{- define "api-service.qps" -}}
 {{- if .Values.qps }}{{ printf "%v" .Values.qps }}{{ else }}{{ "10" }}{{ end }}
 {{- end }}
-
-
diff --git a/deploy/api-service/templates/deployment.yaml b/deploy/api-service/templates/deployment.yaml
index aac0ee3c..b342b0fb 100644
--- a/deploy/api-service/templates/deployment.yaml
+++ b/deploy/api-service/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "api-service.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/api-service/templates/namespace.yaml b/deploy/api-service/templates/namespace.yaml
index 3683bd46..de6f2268 100644
--- a/deploy/api-service/templates/namespace.yaml
+++ b/deploy/api-service/templates/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ .Values.metadata.namespace }}
+  name: {{ .Values.global.namespace }}
   {{- with .Values.namespace.labels }}
   labels:
     {{- toYaml . | nindent 4 }}
diff --git a/deploy/api-service/templates/service.yaml b/deploy/api-service/templates/service.yaml
index 0ac95cbb..aad2bdb0 100644
--- a/deploy/api-service/templates/service.yaml
+++ b/deploy/api-service/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "api-service.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/api-service/values.yaml b/deploy/api-service/values.yaml
index cb46d4b7..cf86494b 100644
--- a/deploy/api-service/values.yaml
+++ b/deploy/api-service/values.yaml
@@ -6,9 +6,6 @@ replicaCount: 1
 
 name: api-service
 
-metadata:
-  namespace: aenv
-
 # Namespace configuration
 namespace:
   # Set to true to automatically create the namespace
diff --git a/deploy/charts/api-service-0.0.1.tgz b/deploy/charts/api-service-0.0.1.tgz
index 0562679a..07f7497b 100644
Binary files a/deploy/charts/api-service-0.0.1.tgz and b/deploy/charts/api-service-0.0.1.tgz differ
diff --git a/deploy/charts/controller-0.0.1.tgz b/deploy/charts/controller-0.0.1.tgz
index eec41c5c..f03166ae 100644
Binary files a/deploy/charts/controller-0.0.1.tgz and b/deploy/charts/controller-0.0.1.tgz differ
diff --git a/deploy/charts/envhub-0.0.1.tgz b/deploy/charts/envhub-0.0.1.tgz
index 7f680558..9948aec9 100644
Binary files a/deploy/charts/envhub-0.0.1.tgz and b/deploy/charts/envhub-0.0.1.tgz differ
diff --git a/deploy/charts/redis-0.1.0.tgz b/deploy/charts/redis-0.1.0.tgz
index d11be5b6..265fd58f 100644
Binary files a/deploy/charts/redis-0.1.0.tgz and b/deploy/charts/redis-0.1.0.tgz differ
diff --git a/deploy/controller/templates/configmap.yaml b/deploy/controller/templates/configmap.yaml
index e70d19d3..c7365e2d 100644
--- a/deploy/controller/templates/configmap.yaml
+++ b/deploy/controller/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "controller.fullname" . }}-pod-templates
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "controller.labels" . | nindent 4 }}
 data:
diff --git a/deploy/controller/templates/deployment.yaml b/deploy/controller/templates/deployment.yaml
index f5e2fcd5..b135bdfb 100644
--- a/deploy/controller/templates/deployment.yaml
+++ b/deploy/controller/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "controller.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/controller/templates/namespace.yaml b/deploy/controller/templates/namespace.yaml
index e6940378..fc7d4657 100644
--- a/deploy/controller/templates/namespace.yaml
+++ b/deploy/controller/templates/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ .Values.metadata.namespace }}
+  name: {{ .Values.global.namespace }}
   {{- with .Values.namespace.labels }}
   labels:
     {{- toYaml . | nindent 4 }}
diff --git a/deploy/controller/templates/rbac.yaml b/deploy/controller/templates/rbac.yaml
index cc681c61..7cbfab0e 100644
--- a/deploy/controller/templates/rbac.yaml
+++ b/deploy/controller/templates/rbac.yaml
@@ -33,7 +33,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "controller.serviceAccountName" . }}
-    namespace: {{ .Values.metadata.namespace }}
+    namespace: {{ .Values.global.namespace }}
 
 {{- if .Values.rbac.additionalNamespaces }}
 {{- range .Values.rbac.additionalNamespaces }}
@@ -53,7 +53,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "controller.serviceAccountName" $ }}
-    namespace: {{ $.Values.metadata.namespace }}
+    namespace: {{ $.Values.global.namespace }}
 {{- end }}
 {{- end }}
 
@@ -63,7 +63,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "controller.fullname" . }}-role
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "controller.labels" . | nindent 4 }}
 rules:
@@ -91,7 +91,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "controller.fullname" . }}-rolebinding
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "controller.labels" . | nindent 4 }}
 roleRef:
@@ -101,6 +101,6 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "controller.serviceAccountName" . }}
-    namespace: {{ .Values.metadata.namespace }}
+    namespace: {{ .Values.global.namespace }}
 
 {{- end }}
diff --git a/deploy/controller/templates/rolebinding.yaml b/deploy/controller/templates/rolebinding.yaml
index 2b18cfd9..51b9963e 100644
--- a/deploy/controller/templates/rolebinding.yaml
+++ b/deploy/controller/templates/rolebinding.yaml
@@ -24,7 +24,7 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: aenv-serviceaccount
-    namespace: {{ .Values.metadata.namespace }}
+    namespace: {{ .Values.global.namespace }}
 
 ---
 
@@ -32,7 +32,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: aenv-serviceaccount-role
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
 rules:
   - apiGroups:
       - '*'
@@ -49,7 +49,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: aenv-serviceaccount-rolebinding
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -57,4 +57,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: aenv-serviceaccount
-    namespace: {{ .Values.metadata.namespace }}
+    namespace: {{ .Values.global.namespace }}
diff --git a/deploy/controller/templates/service.yaml b/deploy/controller/templates/service.yaml
index 9b0393a5..6150cb80 100644
--- a/deploy/controller/templates/service.yaml
+++ b/deploy/controller/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "controller.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/controller/templates/serviceaccount.yaml b/deploy/controller/templates/serviceaccount.yaml
index 3a85c9ca..27fc82df 100644
--- a/deploy/controller/templates/serviceaccount.yaml
+++ b/deploy/controller/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "controller.serviceAccountName" . }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "controller.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/deploy/controller/values.yaml b/deploy/controller/values.yaml
index 5c4ec4a7..2f2e7aa0 100644
--- a/deploy/controller/values.yaml
+++ b/deploy/controller/values.yaml
@@ -6,8 +6,6 @@ replicaCount: 1
 
 name: controller
 
-metadata:
-  namespace: aenv
 sandboxNamespace: aenv-sandbox
 
 # Namespace configuration
diff --git a/deploy/envhub/templates/_helpers.tpl b/deploy/envhub/templates/_helpers.tpl
index b33cfc55..ffb424d0 100644
--- a/deploy/envhub/templates/_helpers.tpl
+++ b/deploy/envhub/templates/_helpers.tpl
@@ -39,6 +39,6 @@ Selector labels
     {{ if .Values.redisAddr }}
         {{- .Values.redisAddr -}}
     {{ else }}
-        {{- printf "redis.%s.svc.cluster.local:6379" .Values.metadata.namespace -}}
+        {{- printf "redis.%s.svc.cluster.local:6379" .Values.global.namespace -}}
     {{ end }}
 {{ end }}
diff --git a/deploy/envhub/templates/deployment.yaml b/deploy/envhub/templates/deployment.yaml
index 44547897..e8744d1c 100644
--- a/deploy/envhub/templates/deployment.yaml
+++ b/deploy/envhub/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "envhub.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/envhub/templates/namespace.yaml b/deploy/envhub/templates/namespace.yaml
index 3683bd46..de6f2268 100644
--- a/deploy/envhub/templates/namespace.yaml
+++ b/deploy/envhub/templates/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ .Values.metadata.namespace }}
+  name: {{ .Values.global.namespace }}
   {{- with .Values.namespace.labels }}
   labels:
     {{- toYaml . | nindent 4 }}
diff --git a/deploy/envhub/templates/secret.yaml b/deploy/envhub/templates/secret.yaml
index d82e7db3..065cb592 100644
--- a/deploy/envhub/templates/secret.yaml
+++ b/deploy/envhub/templates/secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: oss-secret
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
 type: Opaque
 data:
   # OSS credentials (base64 encoded)
diff --git a/deploy/envhub/templates/service.yaml b/deploy/envhub/templates/service.yaml
index 92db4e19..f14f3f04 100644
--- a/deploy/envhub/templates/service.yaml
+++ b/deploy/envhub/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.name }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{ include "envhub.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/envhub/values.yaml b/deploy/envhub/values.yaml
index 6c425f30..8ce82fe6 100644
--- a/deploy/envhub/values.yaml
+++ b/deploy/envhub/values.yaml
@@ -7,9 +7,6 @@ replicaCount: 1
 name: envhub
 
 
-metadata:
-  namespace: aenv
-
 # Namespace configuration
 namespace:
   # Set to true to automatically create the namespace
diff --git a/deploy/redis/templates/deployment.yaml b/deploy/redis/templates/deployment.yaml
index 81e3d6cb..92ac157f 100644
--- a/deploy/redis/templates/deployment.yaml
+++ b/deploy/redis/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "redis.fullname" . }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "redis.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/redis/templates/namespace.yaml b/deploy/redis/templates/namespace.yaml
index 3683bd46..de6f2268 100644
--- a/deploy/redis/templates/namespace.yaml
+++ b/deploy/redis/templates/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ .Values.metadata.namespace }}
+  name: {{ .Values.global.namespace }}
   {{- with .Values.namespace.labels }}
   labels:
     {{- toYaml . | nindent 4 }}
diff --git a/deploy/redis/templates/persistentvolumeclaim.yaml b/deploy/redis/templates/persistentvolumeclaim.yaml
index 389918d7..97342e0a 100644
--- a/deploy/redis/templates/persistentvolumeclaim.yaml
+++ b/deploy/redis/templates/persistentvolumeclaim.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "redis.fullname" . }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "redis.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/redis/templates/service.yaml b/deploy/redis/templates/service.yaml
index b20ad1a2..3ee17050 100644
--- a/deploy/redis/templates/service.yaml
+++ b/deploy/redis/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "redis.fullname" . }}
-  namespace: {{ .Values.metadata.namespace }}
+  namespace: {{ .Values.global.namespace }}
   labels:
     {{- include "redis.labels" . | nindent 4 }}
 spec:
diff --git a/deploy/redis/values.yaml b/deploy/redis/values.yaml
index 6dcfb10a..08f5f7a9 100644
--- a/deploy/redis/values.yaml
+++ b/deploy/redis/values.yaml
@@ -2,9 +2,6 @@
 
 name: redis
 
-metadata:
-  namespace: aenv
-
 # Namespace configuration
 namespace:
   # Set to true to automatically create the namespace
diff --git a/deploy/values.yaml b/deploy/values.yaml
index 07ccd32b..da99e225 100644
--- a/deploy/values.yaml
+++ b/deploy/values.yaml
@@ -13,12 +13,10 @@ controller:
   enabled: true
   replicaCount: 1
   name: controller
-  metadata:
-    namespace: aenv
   sandboxNamespace: aenv-sandbox
   namespace:
     create: true
-  image: aenvironment/controller:0.1.0
+  image: aenvironment/controller:0.1.5
   imagePullPolicy: IfNotPresent
   service:
     type: LoadBalancer
@@ -39,8 +37,6 @@ redis:
   # For persistence with ReadWriteOnce access mode, replicaCount must be 1.
   replicaCount: 1
   name: redis
-  metadata:
-    namespace: aenv
   namespace:
     create: false
   image: redis:7.2.4
@@ -68,11 +64,9 @@ envhub:
   enabled: true
   replicaCount: 1
   name: envhub
-  metadata:
-    namespace: aenv
   namespace:
     create: false
-  image: aenvironment/envhub:0.1.0
+  image: aenvironment/envhub:0.1.5
   imagePullPolicy: IfNotPresent
   service:
     type: LoadBalancer
@@ -93,11 +87,9 @@ api-service:
   enabled: true
   replicaCount: 1
   name: api-service
-  metadata:
-    namespace: aenv
   namespace:
     create: false
-  image: aenvironment/api-service:0.1.0
+  image: aenvironment/api-service:0.1.5
   imagePullPolicy: IfNotPresent
   service:
     type: LoadBalancer