diff --git a/addon/thanos/templates/ingress-prometheus.yaml b/addon/thanos/templates/ingress-prometheus.yaml
index f743bfe193b99aea3367f196369968ba1f6512f1..d11297f7ab5b4ff4d1db12714493528756d6ebdd 100644
--- a/addon/thanos/templates/ingress-prometheus.yaml
+++ b/addon/thanos/templates/ingress-prometheus.yaml
@@ -2,11 +2,11 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.class: traefik
     traefik.frontend.entryPoints: http
   name: prometheus
   namespace: kube-system
 spec:
+  ingressClassName: cern-magnum-traefik
   rules:
   - host: {{ .Values.clusterName }}-prometheus.cern.ch
     http:
diff --git a/srv/argocd/templates/argocd-ingress-http.yaml b/srv/argocd/templates/argocd-ingress-http.yaml
index 930695f331db0b3c9169ab4013857f53fea9ecbc..32fa1a3957fd97ec20a823ed68ebda74009ac894 100644
--- a/srv/argocd/templates/argocd-ingress-http.yaml
+++ b/srv/argocd/templates/argocd-ingress-http.yaml
@@ -3,12 +3,12 @@
 #kind: Ingress
 #metadata:
 #  annotations:
-#    kubernetes.io/ingress.class: traefik
 #    traefik.ingress.kubernetes.io/router.entrypoints: http
 #    traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
 #  name: argocd-server-http
 #  namespace: argocd
 #spec:
+#  ingressClassName: cern-magnum-traefik
 #  rules:
 #  - host: argocd.cern.ch
 #    http:
diff --git a/srv/argocd/templates/grafana-ingress-http.yaml b/srv/argocd/templates/grafana-ingress-http.yaml
index 7e04518a6c6f1e8c5e7bbb617cdad5a3a4c1b7fa..5618368c95970bce4b624fa5eaad8fea821f94bb 100644
--- a/srv/argocd/templates/grafana-ingress-http.yaml
+++ b/srv/argocd/templates/grafana-ingress-http.yaml
@@ -3,12 +3,12 @@
 #kind: Ingress
 #metadata:
 #  annotations:
-#    kubernetes.io/ingress.class: traefik
 #    traefik.ingress.kubernetes.io/router.entrypoints: http
 #    traefik.ingress.kubernetes.io/router.middlewares: kube-system-redirect-scheme@kubernetescrd
 #  name: grafana-ingress-http
 #  namespace: kube-system
 #spec:
+#  ingressClassName: cern-magnum-traefik
 #  rules:
 #  - host: argocd-mon.cern.ch
 #    http:
diff --git a/srv/argocd/templates/grafana-ingress.yaml b/srv/argocd/templates/grafana-ingress.yaml
index eaee0a0c35af96b8d7b455dbaf1c0530ddb8407a..1c305e8f66730099c71f59450c778573c85ddb78 100644
--- a/srv/argocd/templates/grafana-ingress.yaml
+++ b/srv/argocd/templates/grafana-ingress.yaml
@@ -4,7 +4,6 @@
 #metadata:
 #  annotations:
 #    cert-manager.io/cluster-issuer: letsencrypt
-#    kubernetes.io/ingress.class: traefik
 #    traefik.ingress.kubernetes.io/router.entrypoints: https, http, web, websecure
 #    traefik.ingress.kubernetes.io/router.tls: "true"
 #    traefik.ingress.kubernetes.io/router.tls.certresolver: le
@@ -12,6 +11,7 @@
 #  name: grafana-ingress
 #  namespace: kube-system
 #spec:
+#  ingressClassName: cern-magnum-traefik
 #  rules:
 #  - host: argocd-mon.cern.ch
 #    http:
diff --git a/srv/argocd/values.yaml b/srv/argocd/values.yaml
index cc80302f60826dd186bff10ce2e4c335446f92fe..8b5627999e2b1c5a12c039c1e90060d05b740704 100644
--- a/srv/argocd/values.yaml
+++ b/srv/argocd/values.yaml
@@ -61,12 +61,12 @@ argo-cd:
     #ingress:
     #  enabled: true
     #  annotations:
-    #    kubernetes.io/ingress.class: traefik
     #    traefik.ingress.kubernetes.io/router.entrypoints: https, http, web, websecure
     #    traefik.ingress.kubernetes.io/router.tls: "true"
     #    traefik.ingress.kubernetes.io/router.tls.certresolver: le
     #    traefik.ingress.kubernetes.io/router.tls.domains.n.main: kops101-argocd.cern.ch
     #    cert-manager.io/cluster-issuer: letsencrypt
+    #  ingressClassName: cern-magnum-traefik
     #  hosts:
     #  - kops101-argocd.cern.ch
     #  tls: