diff --git a/apps/base/shivering-isles/shields/Chart.yaml b/apps/base/shivering-isles/shields/Chart.yaml
index 88f3469d6654d03c884b0b434a709594ab4a7429..d6021a6eeff078d980aa0acf69cd27c30e3e51df 100644
--- a/apps/base/shivering-isles/shields/Chart.yaml
+++ b/apps/base/shivering-isles/shields/Chart.yaml
@@ -6,7 +6,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.5.0
+version: 0.6.0
 
 # 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
diff --git a/apps/base/shivering-isles/shields/templates/service-monitor.yaml b/apps/base/shivering-isles/shields/templates/service-monitor.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a31ea28403f02d5aa4cf5562c692c18cc1e6ca38
--- /dev/null
+++ b/apps/base/shivering-isles/shields/templates/service-monitor.yaml
@@ -0,0 +1,20 @@
+{{- if .Values.monitoring.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "shields.fullname" . }}
+  labels:
+    {{- include "shields.labels" . | nindent 4 }}
+spec:
+  endpoints:
+    - interval: 30s
+      path: /metrics
+      port: http
+      scheme: HTTP
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "shields.labels" . | nindent 6 }}
+{{- end }}
diff --git a/apps/base/shivering-isles/shields/values.yaml b/apps/base/shivering-isles/shields/values.yaml
index 4f081fbf9aa4616fce9e0bd97331be883ef07493..90a961a545e60a05e6e59b591eb26a3d853349f2 100644
--- a/apps/base/shivering-isles/shields/values.yaml
+++ b/apps/base/shivering-isles/shields/values.yaml
@@ -34,6 +34,9 @@ resources: {}
 imagestream:
   enabled: false
 
+monitoring:
+  enabled: false
+
 ingress:
   enabled: false
   className: ""