diff --git a/deploy.sh b/deploy.sh
index 408dec3..8de13a8 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -25,9 +25,14 @@ command_exists kubectl || err "kubectl not found — install via https://kuberne
 log "helm $(helm version --short)"
 log "kubectl $(kubectl version --client --short 2>/dev/null || kubectl version -o json 2>/dev/null | grep gitVersion)"
 
-# ── 1. Ensure namespace ──────────────────────────────────────────────
-log "Ensuring namespace $NAMESPACE exists..."
+# ── 1. Ensure namespace with Helm ownership ──────────────────────────
+log "Ensuring namespace $NAMESPACE exists with Helm ownership..."
 kubectl create namespace "$NAMESPACE" --dry-run=client -o yaml | kubectl apply -f -
+kubectl label namespace "$NAMESPACE" app.kubernetes.io/managed-by=Helm --overwrite
+kubectl label namespace "$NAMESPACE" meta.helm.sh/release-name="$RELEASE" --overwrite
+kubectl label namespace "$NAMESPACE" meta.helm.sh/release-namespace="$NAMESPACE" --overwrite
+kubectl annotate namespace "$NAMESPACE" meta.helm.sh/release-name="$RELEASE" --overwrite
+kubectl annotate namespace "$NAMESPACE" meta.helm.sh/release-namespace="$NAMESPACE" --overwrite
 
 # ── 2. Ensure prerequisites ─────────────────────────────────────────
 # ConfigMap (must exist before Helm install)
diff --git a/deploy/templates/email_worker/deployment.yaml b/deploy/templates/email_worker/deployment.yaml
index d52dc25..90ab18e 100644
--- a/deploy/templates/email_worker/deployment.yaml
+++ b/deploy/templates/email_worker/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: email_worker
+        - name: email-worker
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/deploy/templates/metrics_aggregator/deployment.yaml b/deploy/templates/metrics_aggregator/deployment.yaml
index 980f3fd..316ac1d 100644
--- a/deploy/templates/metrics_aggregator/deployment.yaml
+++ b/deploy/templates/metrics_aggregator/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: metrics_aggregator
+        - name: metrics-aggregator
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/deploy/templates/static_server/deployment.yaml b/deploy/templates/static_server/deployment.yaml
index 30740f5..d872c7f 100644
--- a/deploy/templates/static_server/deployment.yaml
+++ b/deploy/templates/static_server/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: static_server
+        - name: static-server
           {{- with .Values.securityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}