diff --git a/ansible/group_vars/all/settings.yml.example b/ansible/group_vars/all/settings.yml.example
index c3995919cbd0a80a0ff524209747212472cbf00d..862e90c0bf4ac0903caaf16253e83cf90364e454 100644
--- a/ansible/group_vars/all/settings.yml.example
+++ b/ansible/group_vars/all/settings.yml.example
@@ -77,7 +77,7 @@ enabled_applications:
   # - 'single-sign-on'
   #
   # Monitoring components (auto-enabled by GitLab CI)
-  # - 'prometheus-stack'
+  # - 'kube-prometheus-stack'
   # - 'loki'
   # - 'promtail'
   # - 'eventrouter'
diff --git a/ansible/roles/apps/tasks/prometheus-stack.yml b/ansible/roles/apps/tasks/kube-prometheus-stack.yml
similarity index 86%
rename from ansible/roles/apps/tasks/prometheus-stack.yml
rename to ansible/roles/apps/tasks/kube-prometheus-stack.yml
index 7941f373353210bbf95c8ad262bbd422096cef72..02c4443098718c46f1359033fd19363054f4027e 100644
--- a/ansible/roles/apps/tasks/prometheus-stack.yml
+++ b/ansible/roles/apps/tasks/kube-prometheus-stack.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create prometheus auth secret for basic auth
   tags:
-    - prometheus-stack
+    - kube-prometheus-stack
     - config
     - secret
   k8s:
@@ -17,7 +17,7 @@
 
 - name: Create alertmanager auth secret for basic auth
   tags:
-    - prometheus-stack
+    - kube-prometheus-stack
     - config
     - secret
   k8s:
@@ -36,10 +36,10 @@
     - config
     - flux
     - monitoring
-    - prometheus-stack
+    - kube-prometheus-stack
   vars:
     flux_secret:
-      name: "prometheus-stack"
+      name: "kube-prometheus-stack"
       namespace: "oas"
   include_tasks:
     file: flux_secret.yml
@@ -48,13 +48,13 @@
         - config
         - flux
         - monitoring
-        - prometheus-stack
+        - kube-prometheus-stack
 
 - name: Create prometheus-related persistent volumes
   tags:
     - config
     - monitoring
-    - prometheus-stack
+    - kube-prometheus-stack
   vars:
     pvc:
       name: "{{ item.name }}"
@@ -66,7 +66,7 @@
       tags:
         - config
         - monitoring
-        - prometheus-stack
+        - kube-prometheus-stack
   loop:
     - name: "alertmanager"
       size: "2Gi"
diff --git a/ansible/roles/apps/tasks/main.yml b/ansible/roles/apps/tasks/main.yml
index 3d0b0eff97b18d3cbd09acf12445211079ddc6fb..9405d10799c14af93a711628fabc71fa26101ada 100644
--- a/ansible/roles/apps/tasks/main.yml
+++ b/ansible/roles/apps/tasks/main.yml
@@ -10,7 +10,7 @@
   import_tasks: letsencrypt.yml
 
 - name: Tasks pertaining to prometheus and grafana
-  import_tasks: prometheus-stack.yml
+  import_tasks: kube-prometheus-stack.yml
 
 - name: Tasks pertaining to loki
   import_tasks: loki.yml
diff --git a/ansible/roles/apps/templates/settings/prometheus-stack.yaml b/ansible/roles/apps/templates/settings/kube-prometheus-stack.yaml
similarity index 100%
rename from ansible/roles/apps/templates/settings/prometheus-stack.yaml
rename to ansible/roles/apps/templates/settings/kube-prometheus-stack.yaml
diff --git a/flux/oas/prometheus-stack_hr.yaml b/flux/oas/kube-prometheus-stack_hr.yaml
similarity index 100%
rename from flux/oas/prometheus-stack_hr.yaml
rename to flux/oas/kube-prometheus-stack_hr.yaml