diff --git a/group_vars/stage_devscr/prometheus.yml b/group_vars/stage_devscr/prometheus.yml
index b017a05..9b49ef1 100644
--- a/group_vars/stage_devscr/prometheus.yml
+++ b/group_vars/stage_devscr/prometheus.yml
@@ -19,11 +19,11 @@ k8s_prometheus_helm__release_values:
         nginx.ingress.kubernetes.io/ssl-redirect: "false"
         nginx.ingress.kubernetes.io/whitelist-source-range: "{{ ( ip_whitelist + ip_whitelist_admins ) | join(',') }}"
       hosts:
-        - "{{ stage }}-kube-prometheus.{{ domain }}"
+        - "{{ stage }}-prometheus.{{ domain }}"
       tls:
-        - secretName: "{{ stage }}-kube-prometheus-cert"
+        - secretName: "{{ stage }}-prometheus-cert"
           hosts:
-            - "{{ stage }}-kube-prometheus.{{ domain }}"
+            - "{{ stage }}-prometheus.{{ domain }}"
     prometheusSpec:
       # TODO Using PersistentVolumeClaim
       storageSpec: {}
@@ -47,11 +47,11 @@ k8s_prometheus_helm__release_values:
         nginx.ingress.kubernetes.io/ssl-redirect: "false"
         nginx.ingress.kubernetes.io/whitelist-source-range: "{{ ( ip_whitelist + ip_whitelist_admins ) | join(',') }}"
       hosts:
-        - "{{ stage }}-kube-alertmanager.{{ domain }}"
+        - "{{ stage }}-alertmanager.{{ domain }}"
       tls:
-        - secretName: "{{ stage }}-kube-alertmanager-cert"
+        - secretName: "{{ stage }}-alertmanager-cert"
           hosts:
-            - "{{ stage }}-kube-alertmanager.{{ domain }}"
+            - "{{ stage }}-alertmanager.{{ domain }}"
     deploymentStrategy:
       type: Recreate
   grafana:
@@ -66,11 +66,11 @@ k8s_prometheus_helm__release_values:
         nginx.ingress.kubernetes.io/ssl-redirect: "false"
         nginx.ingress.kubernetes.io/whitelist-source-range: "{{ ( ip_whitelist + ip_whitelist_admins ) | join(',') }}"
       hosts:
-        - "{{ stage }}-kube-grafana.{{ domain }}"
+        - "{{ stage }}-grafana.{{ domain }}"
       tls:
-        - secretName: "{{ stage }}-kube-grafana-cert"
+        - secretName: "{{ stage }}-grafana-cert"
           hosts:
-            - "{{ stage }}-kube-grafana.{{ domain }}"
+            - "{{ stage }}-grafana.{{ domain }}"
     persistence:
       enabled: true
       size: 10Gi
diff --git a/kubernetes.yml b/kubernetes.yml
index bf58f21..f67ddfa 100644
--- a/kubernetes.yml
+++ b/kubernetes.yml
@@ -27,7 +27,9 @@
       tags:
         - ccm
     - { role: kubernetes/container_storage_interface }
-    - { role: kubernetes/prometheus }
+    - role: kubernetes/prometheus
+      tags:
+        - prometheus
     - { role: kubernetes/cert_manager }
     - { role: kubernetes/external_dns }
     - { role: kubernetes/ingress_controller }