diff --git a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
index ac030a1e..1f5fc4ea 100644
--- a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
@@ -43,7 +43,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
@@ -66,7 +70,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index 747112c0..1bd2c53c 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -43,7 +43,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
@@ -66,7 +70,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}