diff --git a/charts/intel/templates/deployment.yaml b/charts/intel/templates/deployment.yaml
index e6325a2..4697f06 100644
--- a/charts/intel/templates/deployment.yaml
+++ b/charts/intel/templates/deployment.yaml
@@ -60,6 +60,10 @@ spec:
             # Set CodeTogether runtime configuration
             - name: CT_HQ_BASE_URL
               value: {{ .Values.codetogether.url | quote }}
+            {{- if .Values.codetogether.customClientsUrl }}
+            - name: CT_CUSTOM_CLIENTS_ORIGIN
+              value: {{ .Values.codetogether.customClientsUrl | quote }}
+            {{- end }}
             {{- if .Values.java.customCacerts.enabled }}
             - name: CT_TRUST_STORE
               value: -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
@@ -87,10 +91,6 @@ spec:
               {{ else }}
                 {{ .Values.ai.url | quote }}
               {{ end }}
-            {{- if .Values.codetogether.customClientsUrl }}
-            - name: CT_CUSTOM_CLIENTS_ORIGIN
-              value: {{ .Values.codetogether.customClientsUrl | quote }}
-            {{- end }}
             - name: CT_HQ_OLLAMA_AI_MODEL_NAME
               value: {{ .Values.ai.modelName | default "gemma3:1b" | quote }}
             - name: CT_HQ_OLLAMA_AI_API_KEY