diff --git a/helm/prometheus-chart/Chart.yaml b/helm/prometheus-chart/Chart.yaml
index 25b1849..54b17b4 100755
--- a/helm/prometheus-chart/Chart.yaml
+++ b/helm/prometheus-chart/Chart.yaml
@@ -12,4 +12,4 @@ sources:
   - https://github.com/prometheus/alertmanager
   - https://github.com/prometheus/prometheus
 tillerVersion: ">=2.8.0"
-version: 0.1.0-[[ .SHA ]]
+version: 0.1.0
diff --git a/helm/prometheus-chart/templates/grafana-deployment.yaml b/helm/prometheus-chart/templates/grafana-deployment.yaml
index f2ece77..48d1fa4 100644
--- a/helm/prometheus-chart/templates/grafana-deployment.yaml
+++ b/helm/prometheus-chart/templates/grafana-deployment.yaml
@@ -75,9 +75,11 @@ spec:
             - name: config
               mountPath: "/etc/grafana/grafana.ini"
               subPath: grafana.ini
+            {{- if .Values.grafana.auth }}
             - name: ldap
               mountPath: "/etc/grafana/ldap.toml"
               subPath: ldap.toml
+            {{- end }}
             # Data sources to provision on startup
             - name: datasources
               mountPath: /etc/grafana/provisioning/datasources
@@ -127,12 +129,14 @@ spec:
         - name: config
           configMap:
             name: {{ template "prometheus.grafana.fullname" . }}
+        {{- if .Values.grafana.auth }}
         - name: ldap
           secret:
             secretName: {{ template "prometheus.grafana.fullname" . }}
             items:
               - key: ldap-toml
                 path: ldap.toml
+        {{- end }}
         - name: datasources
           configMap:
             name: grafana-datasources
diff --git a/helm/prometheus-chart/values.yaml b/helm/prometheus-chart/values.yaml
index 0b1d591..b988202 100644
--- a/helm/prometheus-chart/values.yaml
+++ b/helm/prometheus-chart/values.yaml
@@ -2,7 +2,7 @@
 alertmanager:
   ## If false, alertmanager will not be installed
   ##
-  enabled: true
+  enabled: false
 
   ## alertmanager container name
   ##
@@ -104,7 +104,7 @@ alertmanager:
     ## If true, alertmanager will create/use a Persistent Volume Claim
     ## If false, use emptyDir
     ##
-    enabled: true
+    enabled: false
 
     ## alertmanager data Persistent Volume access modes
     ## Must match those of existing PV or dynamic provisioner
@@ -360,7 +360,7 @@ server:
     ## If true, Prometheus server will create/use a Persistent Volume Claim
     ## If false, use emptyDir
     ##
-    enabled: true
+    enabled: false
 
     ## Prometheus server data Persistent Volume access modes
     ## Must match those of existing PV or dynamic provisioner
@@ -449,7 +449,7 @@ initChownData:
   ## If false, data ownership will not be reset at startup
   ## This allows the prometheus-server to be run with an arbitrary user
   ##
-  enabled: true
+  enabled: false
 
   ## initChownData container name
   ##
@@ -868,7 +868,7 @@ grafana:
   affinity: {}
 
   adminUser: admin
-  # adminPassword: strongpassword
+  adminPassword: strongpassword
 
   ## Use an alternate scheduler, e.g. "stork".
   ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/