diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index c3a84ea4..df2f93ce 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -2,7 +2,11 @@
 {{- $serviceName := include "argo-cd.server.fullname" . -}}
 {{- $servicePort := .Values.server.service.servicePortHttp -}}
 {{- $paths := .Values.server.ingress.paths -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}
diff --git a/charts/argo/templates/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml
index 5786e257..bee5a7f8 100644
--- a/charts/argo/templates/server-ingress.yaml
+++ b/charts/argo/templates/server-ingress.yaml
@@ -2,7 +2,11 @@
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
 {{- $servicePort := .Values.server.servicePort -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-{{ .Values.server.name }}