diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da8898a26544d84a698f363509f38e9537b699fb..05f2d01dace8d4bbaf6fd079e52eeec962c391c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -842,7 +842,6 @@ kube-prometheus-stack-alerts:
     # Enforce python requests using the system cert store, where LE staging
     # cacert is added
     REQUESTS_CA_BUNDLE: "/etc/ssl/certs/ca-certificates.crt"
-  allow_failure: true
   script:
     - *debug_information
     - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-prometheus-basic-auth | cut -d'=' -f2)
diff --git a/flux2/apps/monitoring/eventrouter-release.yaml b/flux2/apps/monitoring/eventrouter-release.yaml
index 713c5d80cf0b06504f786afbf178bff299f1db44..f238a4aef0167c02ca2f5435a5364f31b9970db0 100644
--- a/flux2/apps/monitoring/eventrouter-release.yaml
+++ b/flux2/apps/monitoring/eventrouter-release.yaml
@@ -9,6 +9,7 @@ spec:
   chart:
     spec:
       # https://github.com/helm/charts/tree/master/stable/eventrouter
+      # In transitionto bitnami chart repo (https://github.com/bitnami/charts/pull/4698)
       chart: eventrouter
       version: 0.3.2
       sourceRef:
diff --git a/flux2/apps/monitoring/eventrouter-values-configmap.yaml b/flux2/apps/monitoring/eventrouter-values-configmap.yaml
index e02c55b6daddb203d19c659a62d9699847325439..aa6f0bef85c11ffd4081980b55fdcec647975f25 100644
--- a/flux2/apps/monitoring/eventrouter-values-configmap.yaml
+++ b/flux2/apps/monitoring/eventrouter-values-configmap.yaml
@@ -9,7 +9,7 @@ data:
     resources:
       limits:
         memory: 400Mi
-        cpu: 200m
+        cpu: 400m
       requests:
         memory: 200Mi
-        cpu: 100m
+        cpu: 200m
diff --git a/install/generate_secrets.py b/install/generate_secrets.py
index 93f5702c779a42061d9b3e15b70d33a1310adf69..95b3e6cba2e05fc35d68adeef1fc8e40eb5fb696 100644
--- a/install/generate_secrets.py
+++ b/install/generate_secrets.py
@@ -64,6 +64,8 @@ def create_variables_secret(app_name, env):
             else:
                 print(f"Secret {secret_name} in namespace {secret_namespace}"
                       " already exists. Not generating new secrets.")
+    else:
+        print(f'File {variables_filename} does not exist.')
 
 
 def create_basic_auth_secret(app_name, env):
@@ -93,6 +95,8 @@ def create_basic_auth_secret(app_name, env):
             else:
                 print(f"Secret {secret_name} in namespace {secret_namespace}"
                       " already exists. Not generating new secrets.")
+    else:
+        print(f'File {basic_auth_filename} does not exist.')
 
 def get_secret_metadata(yaml_string):
     """Returns secret name and namespace from metadata field in a yaml string"""
diff --git a/install/install-openappstack.sh b/install/install-openappstack.sh
index 2056236eec5dacedb769925f68fa4bac77987217..f4b5515821ad9e1ace18ce41ba34d29e05e3a8b7 100755
--- a/install/install-openappstack.sh
+++ b/install/install-openappstack.sh
@@ -25,6 +25,7 @@ python "$(dirname "$0")/generate_secrets.py" oauth
 
 # Generate secrets for monitoring
 python "$(dirname "$0")/generate_secrets.py" kube-prometheus-stack
+python "$(dirname "$0")/generate_secrets.py" prometheus
 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-prometheus-basic-auth.yaml.jinja
similarity index 100%
rename from install/templates/oas-prometheus-basic-auth.yaml
rename to install/templates/oas-prometheus-basic-auth.yaml.jinja