diff --git a/charts/vault-monitoring/ci/default-values.yaml b/charts/vault-monitoring/ci/default-values.yaml
index c4a5bb95f..8fd6605d2 100644
--- a/charts/vault-monitoring/ci/default-values.yaml
+++ b/charts/vault-monitoring/ci/default-values.yaml
@@ -3,3 +3,5 @@ vault:
     create: true
     labels:
       k8s.example.com/prometheus: kube-prometheus
+prometheusRules:
+  enabled: false
diff --git a/charts/vault-monitoring/templates/configmap.yaml b/charts/vault-monitoring/templates/configmap.yaml
index 52c206c28..4c3963456 100644
--- a/charts/vault-monitoring/templates/configmap.yaml
+++ b/charts/vault-monitoring/templates/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.vault.serviceMonitor.authentication }}
+{{- if and (.Values.vault.serviceMonitor.authentication) (.Values.vault.serviceMonitor.create) }}
 apiVersion: "v1"
 kind: "ConfigMap"
 metadata:
diff --git a/charts/vault-monitoring/templates/endpoint.yaml b/charts/vault-monitoring/templates/endpoint.yaml
index 5a87a906e..f21042315 100644
--- a/charts/vault-monitoring/templates/endpoint.yaml
+++ b/charts/vault-monitoring/templates/endpoint.yaml
@@ -1,4 +1,4 @@
-{{- if eq .Values.vault.service.type "ExternalName" }}
+{{- if and (eq .Values.vault.service.type "ExternalName") (.Values.vault.serviceMonitor.create) }}
 apiVersion: v1
 kind: Endpoints
 metadata: