diff --git a/app/srv-argocd.yaml b/app/srv-argocd.yaml
index 04bc0dad1a18aff00ca390a04d501a7f0b889d85..404f7091d5304ebd51713fd27c8a7092336c3e66 100644
--- a/app/srv-argocd.yaml
+++ b/app/srv-argocd.yaml
@@ -1,32 +1,35 @@
-#---
-#apiVersion: argoproj.io/v1alpha1
-#kind: ApplicationSet
-#metadata:
-#  name: argocd
-#  namespace: argocd
-#spec:
-#  generators:
-#  - clusters:
-#      selector:
-#        matchLabels:
-#          central: "true"
-#  template:
-#    metadata:
-#      name: '{{name}}-argocd'
-#    spec:
-#      project: default
-#      source:
-#        repoURL: https://gitlab.cern.ch/kubernetes/automation/101/argocd.git
-#        targetRevision: master
-#        path: srv/argocd
-#        plugin: {}
-#      destination:
-#        server: '{{server}}'
-#        namespace: argocd
-#      syncPolicy:
-#        automated:
-#          allowEmpty: true
-#          prune: true
-#          selfHeal: true
-#        syncOptions:
-#          - CreateNamespace=true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: argocd
+  namespace: argocd
+spec:
+  generators:
+  - clusters:
+      selector:
+        matchLabels:
+          central: "true"
+  template:
+    metadata:
+      name: '{{name}}-argocd'
+      labels:
+        area: "infra"
+        type: "service"
+    spec:
+      project: default
+      source:
+        repoURL: https://gitlab.cern.ch/kubernetes/automation/101/argocd.git
+        targetRevision: master
+        path: srv/argocd
+        plugin: {}
+      destination:
+        server: '{{server}}'
+        namespace: argocd
+      syncPolicy:
+        automated:
+          allowEmpty: true
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
diff --git a/app/srv-thanos.yaml b/app/srv-thanos.yaml
index 5e910c71acdda383e10a0c9c777111df0434f7a9..c27dc2239441b6f890654b2ceb5f535144dfffe1 100644
--- a/app/srv-thanos.yaml
+++ b/app/srv-thanos.yaml
@@ -14,7 +14,7 @@ spec:
     metadata:
       name: '{{name}}-thanos'
       labels:
-        area: "monitoring"
+        area: "infra"
         type: "service"
     spec:
       project: default
diff --git a/srv/argocd/templates/argocd-ingress-http.yaml b/srv/argocd/templates/argocd-ingress-http.yaml
index a0152d2ce065afe8ea41a89374885b2ceb1f26b8..930695f331db0b3c9169ab4013857f53fea9ecbc 100644
--- a/srv/argocd/templates/argocd-ingress-http.yaml
+++ b/srv/argocd/templates/argocd-ingress-http.yaml
@@ -1,21 +1,22 @@
-apiVersion: networking.k8s.io/v1
-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:
-  rules:
-  - host: kops101-argocd.cern.ch
-    http:
-      paths:
-      - backend:
-          service:
-            name: argocd-server
-            port:
-              number: 2746
-        path: /
-        pathType: Prefix
+#---
+#apiVersion: networking.k8s.io/v1
+#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:
+#  rules:
+#  - host: argocd.cern.ch
+#    http:
+#      paths:
+#      - backend:
+#          service:
+#            name: argocd-server
+#            port:
+#              number: 2746
+#        path: /
+#        pathType: Prefix
diff --git a/srv/argocd/templates/grafana-ingress-http.yaml b/srv/argocd/templates/grafana-ingress-http.yaml
index 01edf005101bf5aa50469baee37d105c0e2c81d0..7e04518a6c6f1e8c5e7bbb617cdad5a3a4c1b7fa 100644
--- a/srv/argocd/templates/grafana-ingress-http.yaml
+++ b/srv/argocd/templates/grafana-ingress-http.yaml
@@ -1,21 +1,22 @@
-apiVersion: networking.k8s.io/v1
-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:
-  rules:
-  - host: kops101-argocd-mon.cern.ch
-    http:
-      paths:
-      - backend:
-          service:
-            name: cern-magnum-grafana
-            port:
-              number: 80
-        path: /
-        pathType: Prefix
+#---
+#apiVersion: networking.k8s.io/v1
+#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:
+#  rules:
+#  - host: argocd-mon.cern.ch
+#    http:
+#      paths:
+#      - backend:
+#          service:
+#            name: cern-magnum-grafana
+#            port:
+#              number: 80
+#        path: /
+#        pathType: Prefix
diff --git a/srv/argocd/templates/grafana-ingress.yaml b/srv/argocd/templates/grafana-ingress.yaml
index 613818e7767d7ca829ef474f92c1ec7a0cf5ad1f..eaee0a0c35af96b8d7b455dbaf1c0530ddb8407a 100644
--- a/srv/argocd/templates/grafana-ingress.yaml
+++ b/srv/argocd/templates/grafana-ingress.yaml
@@ -1,28 +1,29 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-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
-    traefik.ingress.kubernetes.io/router.tls.domains.n.main: kops101-argocd-mon.cern.ch
-  name: grafana-ingress
-  namespace: kube-system
-spec:
-  rules:
-  - host: kops101-argocd-mon.cern.ch
-    http:
-      paths:
-      - backend:
-          service:
-            name: cern-magnum-grafana
-            port:
-              number: 80
-        path: /
-        pathType: Prefix
-  tls:
-  - hosts:
-    - kops-mon.cern.ch
-    secretName: cert-manager-tls-ingress-secret-grafana
+#---
+#apiVersion: networking.k8s.io/v1
+#kind: Ingress
+#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
+#    traefik.ingress.kubernetes.io/router.tls.domains.n.main: argocd-mon.cern.ch
+#  name: grafana-ingress
+#  namespace: kube-system
+#spec:
+#  rules:
+#  - host: argocd-mon.cern.ch
+#    http:
+#      paths:
+#      - backend:
+#          service:
+#            name: cern-magnum-grafana
+#            port:
+#              number: 80
+#        path: /
+#        pathType: Prefix
+#  tls:
+#  - hosts:
+#    - argocd-mon.cern.ch
+#    secretName: cert-manager-tls-ingress-secret-grafana