diff --git a/charts/kamu-api-server/Chart.yaml b/charts/kamu-api-server/Chart.yaml
index d8e2f6b..9c62ead 100644
--- a/charts/kamu-api-server/Chart.yaml
+++ b/charts/kamu-api-server/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kamu-api-server
 description: API server component of the Kamu Compute Node
 type: application
-version: 0.37.0
-appVersion: "0.37.0"
+version: 0.37.1
+appVersion: "0.37.1"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png
 sources:
diff --git a/charts/kamu-api-server/templates/servicemonitor.yaml b/charts/kamu-api-server/templates/servicemonitor.yaml
new file mode 100644
index 0000000..cf6de58
--- /dev/null
+++ b/charts/kamu-api-server/templates/servicemonitor.yaml
@@ -0,0 +1,15 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "kamu-api-server.fullname" . }}
+  labels:
+    {{- include "kamu-api-server.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "kamu-api-server.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - interval: 15s
+    path: /system/metrics
+    port: http
+    scheme: http
diff --git a/charts/kamu-oracle-provider/Chart.yaml b/charts/kamu-oracle-provider/Chart.yaml
index fa9d636..ff90c3a 100644
--- a/charts/kamu-oracle-provider/Chart.yaml
+++ b/charts/kamu-oracle-provider/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kamu-oracle-provider
 description: Oracle provider that uses Kamu Node to supply data to blockchain smart contracts
 type: application
-version: 0.37.0
-appVersion: "0.37.0"
+version: 0.37.1
+appVersion: "0.37.1"
 home: https://kamu.dev
 icon: https://www.kamu.dev/images/kamu_logo_icon_bg_square.png
 sources:
diff --git a/charts/kamu-oracle-provider/templates/service.yaml b/charts/kamu-oracle-provider/templates/service.yaml
new file mode 100644
index 0000000..d706a33
--- /dev/null
+++ b/charts/kamu-oracle-provider/templates/service.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "kamu-oracle-provider.fullname" . }}
+  labels:
+    {{- include "kamu-oracle-provider.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  # Headless service, for monitoring only
+  clusterIP: None
+  type: ClusterIP
+  selector:
+    {{- include "kamu-oracle-provider.selectorLabels" . | nindent 4 }}
+  ports:
+    - port: 8080
+      name: http
+      targetPort: http
+      protocol: TCP
diff --git a/charts/kamu-oracle-provider/templates/servicemonitor.yaml b/charts/kamu-oracle-provider/templates/servicemonitor.yaml
new file mode 100644
index 0000000..cf6de58
--- /dev/null
+++ b/charts/kamu-oracle-provider/templates/servicemonitor.yaml
@@ -0,0 +1,15 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "kamu-api-server.fullname" . }}
+  labels:
+    {{- include "kamu-api-server.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "kamu-api-server.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - interval: 15s
+    path: /system/metrics
+    port: http
+    scheme: http