diff --git a/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml b/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml
index d944a487..2cfa2dc3 100644
--- a/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml
+++ b/charts/argo-cd/templates/argocd-server/gateway-httproute.yaml
@@ -19,7 +19,7 @@ spec:
   parentRefs:
     - group: gateway.networking.k8s.io
       kind: Gateway
-      name: {{ tpl .Values.server.gateway.name . }}
+      name: {{ .Values.server.gateway.name | default (include "argo-cd.server.fullname" .) }}
       {{- with .Values.server.gateway.httpRoute.gatewaySection }}
       sectionName: {{ . }}
       {{- end }}
diff --git a/charts/argo-cd/templates/argocd-server/gateway.yaml b/charts/argo-cd/templates/argocd-server/gateway.yaml
index 8f452018..311bc943 100644
--- a/charts/argo-cd/templates/argocd-server/gateway.yaml
+++ b/charts/argo-cd/templates/argocd-server/gateway.yaml
@@ -2,7 +2,7 @@
 kind: Gateway
 apiVersion: gateway.networking.k8s.io/v1
 metadata:
-  name: {{ tpl .Values.server.gateway.name . }}
+  name: {{ .Values.server.gateway.name | default (include "argo-cd.server.fullname" .) }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index f86a59da..fc14b08e 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -2157,7 +2157,9 @@ server:
     # -- enable a gateway resource for ArgoCD
     ## Note: you can already have an existing Gateway and just wanted to add a route and backend policy to that Gateway, let false in that case
     enabled: false
-    name: '{{ include "argo-cd.server.fullname" . }}'
+    # -- Name of the new gateway
+    # @default -- `""` (calculated with template "argo-cd.server.fullname") (See [values.yaml])
+    name: ""
     # -- Specific implementation for gateway controller. Only `None` and `gke` are supported.
     ## With `None`, the gateway is supposed to already exist and no specific object will be created
     ## Additional configuration might be required in related configuration sections for `gke`