diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb243c290a6b3bec40026dabd5fae15ebdaa86c3..5f2c1a908addc86bc397a23fe45759172a208183 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -844,7 +844,7 @@ kube-prometheus-stack-alerts:
   allow_failure: true
   script:
     - *debug_information
-    - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-prometheus-basic-auth | cut -d'=' -f2)
+    - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-kube-prometheus-stack-basic-auth | cut -d'=' -f2)
     - cd test/
     - pytest -s -m 'prometheus' --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*'
   extends:
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-release.yaml b/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
index 7c252f302da07bf738862b97f2d7c9385de83388..a982303d866e9d8209f5b3a290abd90b110f66be 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
@@ -135,7 +135,7 @@ spec:
         enabled: true
         annotations:
           nginx.ingress.kubernetes.io/auth-type: basic
-          nginx.ingress.kubernetes.io/auth-secret: oas-prometheus-basic-auth
+          nginx.ingress.kubernetes.io/auth-secret: oas-kube-prometheus-stack-basic-auth
           nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
           kubernetes.io/tls-acme: "true"
         pathType: ImplementationSpecific
diff --git a/install/install-openappstack.sh b/install/install-openappstack.sh
index 0c7f12b33de12181f38f47bf9b58dc73619dc938..2056236eec5dacedb769925f68fa4bac77987217 100755
--- a/install/install-openappstack.sh
+++ b/install/install-openappstack.sh
@@ -24,7 +24,7 @@ python "$(dirname "$0")/generate_secrets.py" single-sign-on
 python "$(dirname "$0")/generate_secrets.py" oauth
 
 # Generate secrets for monitoring
-python "$(dirname "$0")/generate_secrets.py" prometheus
+python "$(dirname "$0")/generate_secrets.py" kube-prometheus-stack
 python "$(dirname "$0")/generate_secrets.py" alertmanager
 
 flux create source git openappstack \
diff --git a/install/templates/oas-prometheus-basic-auth.yaml b/install/templates/oas-kube-prometheus-stack-basic-auth.yaml
similarity index 84%
rename from install/templates/oas-prometheus-basic-auth.yaml
rename to install/templates/oas-kube-prometheus-stack-basic-auth.yaml
index d4d2d35521890ed6a3f53951b8a77070a1b8d2f6..cb4f6fe32ef316700de314d6fb1edbeb4548ec89 100644
--- a/install/templates/oas-prometheus-basic-auth.yaml
+++ b/install/templates/oas-kube-prometheus-stack-basic-auth.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   namespace: "oas"
-  name: "oas-prometheus-basic-auth"
+  name: "oas-kube-prometheus-stack-basic-auth"
 data:
   # Readable version of the password for humans who want to log in
   pass: "{{ pass | b64encode }}"
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 7a36b03809c37cdb64ace1a851ebcdb33dc1b592..5680e15d6bb6dcab6d196672c46805623490492b 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -224,7 +224,7 @@ KUBECONFIG={cluster_dir}/kube_config_cluster.yml
             },
             'oas': {
                 'oas-alertmanager-basic-auth': ['pass'],
-                'oas-prometheus-basic-auth': ['pass']
+                'oas-kube-prometheus-stack-basic-auth': ['pass']
             }
         }