diff --git a/charts/vault-monitoring/.Chart.yaml.swp b/charts/vault-monitoring/.Chart.yaml.swp
new file mode 100644
index 000000000..6f719e686
Binary files /dev/null and b/charts/vault-monitoring/.Chart.yaml.swp differ
diff --git a/charts/vault-monitoring/Chart.yaml b/charts/vault-monitoring/Chart.yaml
index 081f7076b..76f8be3dc 100644
--- a/charts/vault-monitoring/Chart.yaml
+++ b/charts/vault-monitoring/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: vault-monitoring
 description: monitor your vault server from within Kubernetes' prometheus
 type: application
-version: 0.5.0
+version: 0.6.0
 home: https://github.com/adfinis/helm-charts/tree/main/charts/vault-monitoring
 sources:
   - https://github.com/adfinis/helm-charts/tree/main/charts/vault-monitoring
@@ -13,4 +13,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: "Only create service vault-monitoring when serviceMonitor.create=true"
+      description: "Only create ConfigMap and Endpoint when serviceMonitor.create=true"
diff --git a/charts/vault-monitoring/README.md b/charts/vault-monitoring/README.md
index 8020d3ce8..9f3826b04 100644
--- a/charts/vault-monitoring/README.md
+++ b/charts/vault-monitoring/README.md
@@ -1,6 +1,6 @@
 # vault-monitoring
 
-![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 monitor your vault server from within Kubernetes' prometheus
 
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: