diff --git a/charts/aci-monitoring-stack/Chart.yaml b/charts/aci-monitoring-stack/Chart.yaml
index c1f406a..8c3f90f 100644
--- a/charts/aci-monitoring-stack/Chart.yaml
+++ b/charts/aci-monitoring-stack/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
diff --git a/charts/aci-monitoring-stack/templates/loki/loki-configmap-alerts.yaml b/charts/aci-monitoring-stack/templates/loki/loki-configmap-alerts.yaml
index b0fbfbf..9796db9 100644
--- a/charts/aci-monitoring-stack/templates/loki/loki-configmap-alerts.yaml
+++ b/charts/aci-monitoring-stack/templates/loki/loki-configmap-alerts.yaml
@@ -1,3 +1,4 @@
+{{- if $.Values.loki.enabled }}
 {{- $files := .Files.Glob "alerts/loki/*.yaml" }}
 {{- if $files }}
 apiVersion: v1
@@ -20,4 +21,5 @@ items:
   data:
     {{ $dashboardName }}.yaml: {{ $.Files.Get $path | toYaml | indent 4 }}
 {{- end }}
+{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/aci-monitoring-stack/templates/loki/loki-configmaps-datasources.yaml b/charts/aci-monitoring-stack/templates/loki/loki-configmaps-datasources.yaml
index 3fc4688..5931d36 100644
--- a/charts/aci-monitoring-stack/templates/loki/loki-configmaps-datasources.yaml
+++ b/charts/aci-monitoring-stack/templates/loki/loki-configmaps-datasources.yaml
@@ -1,4 +1,5 @@
 {{- if $.Values.grafana.sidecar.datasources.enabled }}
+{{- if $.Values.loki.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -34,4 +35,5 @@ data:
       {{- end }}
 {{- end }}
 
+{{- end }}
 {{- end }}
\ No newline at end of file