diff --git a/antmedia-2.16.2.tgz b/antmedia-2.16.2.tgz
index 36a588e..5bc0523 100644
Binary files a/antmedia-2.16.2.tgz and b/antmedia-2.16.2.tgz differ
diff --git a/index.yaml b/index.yaml
index 2612291..e262fc4 100644
--- a/index.yaml
+++ b/index.yaml
@@ -3,13 +3,13 @@ entries:
   antmedia:
   - apiVersion: v2
     appVersion: 2.16.2
-    created: "2025-12-10T11:14:47.188265138Z"
+    created: "2026-01-25T17:27:58.534316041Z"
     dependencies:
     - name: ingress-nginx
       repository: https://kubernetes.github.io/ingress-nginx
       version: <= 4.4.0
     description: A Helm chart for Kubernetes
-    digest: fa4906cd22a184e1e3278a696fedb2e70e3e218c0ec71bdd795ced70272e3ce5
+    digest: db84ee0520f7d63aa92cc8112a2c467d16d2deb311aed09c99db1d2f49ef46c3
     name: antmedia
     type: application
     urls:
@@ -137,7 +137,7 @@ entries:
       artifacthub.io/prerelease: "false"
     apiVersion: v2
     appVersion: 1.5.1
-    created: "2025-12-10T11:14:47.19184857Z"
+    created: "2026-01-25T17:27:58.536781433Z"
     description: Ingress controller for Kubernetes using NGINX as a reverse proxy
       and load balancer
     digest: 5c5ffcd4a19377f9e2eeb40fd8c0a2a7a9f851db74453247c357c83e1775c330
@@ -160,12 +160,12 @@ entries:
   monitoring:
   - apiVersion: v2
     appVersion: 1.0.0
-    created: "2025-12-10T11:14:47.192688679Z"
+    created: "2026-01-25T17:27:58.537848319Z"
     description: A Helm chart for Kubernetes
-    digest: ea668c32326f240b603e2a0f3d79767eb65cc1819652049ec4b85fce66854863
+    digest: 10e9031a59fdc117e9930f08d44fcd596fb49ce14031a805d0eeb35b3c913ea9
     name: monitoring
     type: application
     urls:
     - https://ant-media.github.io/helm/monitoring/monitoring-1.0.0.tgz
     version: 1.0.0
-generated: "2025-12-10T11:14:47.184244857Z"
+generated: "2026-01-25T17:27:58.529588986Z"
diff --git a/monitoring/monitoring-1.0.0.tgz b/monitoring/monitoring-1.0.0.tgz
index 2ffb4ba..770775c 100644
Binary files a/monitoring/monitoring-1.0.0.tgz and b/monitoring/monitoring-1.0.0.tgz differ
diff --git a/templates/ams-k8s-deployment-edge.yaml b/templates/ams-k8s-deployment-edge.yaml
index 83e8c63..85a330f 100644
--- a/templates/ams-k8s-deployment-edge.yaml
+++ b/templates/ams-k8s-deployment-edge.yaml
@@ -55,7 +55,31 @@ spec:
       - name: ant-media-server
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" 
         imagePullPolicy: {{ .Values.image.pullPolicy }}        
-        args: ["-g", "{{ .Values.UseGlobalIP }}", "-s", "{{ .Values.UseServerName }}", "-r", "{{ .Values.ReplaceCandidateAddress }}", "-m", "cluster", "-h", "$(MONGO_URL)", "-l", "$(LICENSE_KEY)", "-a", "{{ .Values.TurnStunServerURL }}", "-n", "{{ .Values.TurnUsername }}", "-w", "{{ .Values.TurnPassword }}", "-k", "{{ .Values.kafkaURL }}"]
+        args:
+          - -g
+          - "{{ .Values.UseGlobalIP }}"
+          - -s
+          - "{{ .Values.UseServerName }}"
+          - -r
+          - "{{ .Values.ReplaceCandidateAddress }}"
+          - -m
+          - cluster
+          - -h
+          - "$(MONGO_URL)"
+          - -l
+          - "$(LICENSE_KEY)"
+          {{- if not (empty .Values.TurnStunServerURL) }}
+          - -a
+          - "$(TURN_SERVER)"
+          - -n
+          - "$(TURN_USERNAME)"
+          - -w
+          - "$(TURN_PASSWORD)"
+          {{- end }}
+          {{- if not (empty .Values.kafkaURL) }}
+          - -k
+          - "{{ .Values.kafkaURL }}"
+          {{- end }}
         env:
           - name: MONGO_URL
             valueFrom:
@@ -63,9 +87,15 @@ spec:
                 name: mongodb-config
                 key: mongoURL
           - name: LICENSE_KEY
-            value: "{{ if and .Values.edgeLicense (not (empty .Values.edgeLicense.Key)) }}{{ .Values.edgeLicense.Key }}{{ else }}{{ .Values.licenseKey }}{{ end }}"
-
-
+            value: "{{ if and .Values.originLicense (not (empty .Values.originLicense.Key)) }}{{ .Values.originLicense.Key }}{{ else }}{{ .Values.licenseKey }}{{ end }}"
+          {{- if not (empty .Values.TurnStunServerURL) }}
+          - name: TURN_SERVER
+            value: "{{ .Values.TurnStunServerURL }}"
+          - name: TURN_USERNAME
+            value: "{{ .Values.TurnUsername }}"
+          - name: TURN_PASSWORD
+            value: "{{ .Values.TurnPassword }}"
+          {{- end }}
 
         livenessProbe:
           failureThreshold: 3
diff --git a/templates/ams-k8s-deployment-origin.yaml b/templates/ams-k8s-deployment-origin.yaml
index e9f4a9e..56e185f 100644
--- a/templates/ams-k8s-deployment-origin.yaml
+++ b/templates/ams-k8s-deployment-origin.yaml
@@ -54,7 +54,31 @@ spec:
       - name: ant-media-server
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" 
         imagePullPolicy: {{ .Values.image.pullPolicy }}   
-        args: ["-g", "{{ .Values.UseGlobalIP }}", "-s", "{{ .Values.UseServerName }}", "-r", "{{ .Values.ReplaceCandidateAddress }}", "-m", "cluster", "-h", "$(MONGO_URL)", "-l", "$(LICENSE_KEY)", "-a", "{{ .Values.TurnStunServerURL }}", "-n", "{{ .Values.TurnUsername }}", "-w", "{{ .Values.TurnPassword }}", "-k", "{{ .Values.kafkaURL }}"]
+        args:
+          - -g
+          - "{{ .Values.UseGlobalIP }}"
+          - -s
+          - "{{ .Values.UseServerName }}"
+          - -r
+          - "{{ .Values.ReplaceCandidateAddress }}"
+          - -m
+          - cluster
+          - -h
+          - "$(MONGO_URL)"
+          - -l
+          - "$(LICENSE_KEY)"
+          {{- if not (empty .Values.TurnStunServerURL) }}
+          - -a
+          - "$(TURN_SERVER)"
+          - -n
+          - "$(TURN_USERNAME)"
+          - -w
+          - "$(TURN_PASSWORD)"
+          {{- end }}
+          {{- if not (empty .Values.kafkaURL) }}
+          - -k
+          - "{{ .Values.kafkaURL }}"
+          {{- end }}
         env:
           - name: MONGO_URL
             valueFrom:
@@ -63,6 +87,14 @@ spec:
                 key: mongoURL
           - name: LICENSE_KEY
             value: "{{ if and .Values.originLicense (not (empty .Values.originLicense.Key)) }}{{ .Values.originLicense.Key }}{{ else }}{{ .Values.licenseKey }}{{ end }}"
+          {{- if not (empty .Values.TurnStunServerURL) }}
+          - name: TURN_SERVER
+            value: "{{ .Values.TurnStunServerURL }}"
+          - name: TURN_USERNAME
+            value: "{{ .Values.TurnUsername }}"
+          - name: TURN_PASSWORD
+            value: "{{ .Values.TurnPassword }}"
+          {{- end }}
 
         livenessProbe:
           failureThreshold: 3