diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
index 00da64fa..35b35535 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -88,6 +88,60 @@ spec:
         port: 9168
         description: "Monitoring Exporter"
 
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: gitaly
+        port: 9236
+        description: "Gitaly Service Monitor"
+
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: gitlab-shell
+        port: 9122
+        description: "Gitlab Shell Service Monitor"
+
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: registry
+        port: 5001
+        description: "Registry Service Monitor"
+
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: webservice
+        port: 8083
+        description: "Webservice Service Monitor"
+
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: webservice
+        port: 9229
+        description: "Workhorse Service Monitor"
+
+      - direction: Ingress
+        remoteNamespace: monitoring
+        remoteSelector:
+          app: prometheus
+        selector:
+          app: gitlab-pages
+        port: 9235
+        description: "Pages Service Monitor"
+
       - direction: Egress
         selector:
           app: registry
diff --git a/values/common-values.yaml b/values/common-values.yaml
index d120678a..8b33324a 100644
--- a/values/common-values.yaml
+++ b/values/common-values.yaml
@@ -39,7 +39,7 @@ global:
     enabled: false
     credentials:
       {}
-      # secret:
+
 
   appConfig:
     object_store:
@@ -97,8 +97,6 @@ global:
     enabled: true
     create: true
     annotations: {}
-    ## Name to be used for serviceAccount, otherwise defaults to chart fullname
-    # name:
 
 postgresql:
   install: false
@@ -112,7 +110,7 @@ registry:
     key: registry
   metrics:
     enabled: true
-    serviceMonitor: # TODO configure for Prometheus
+    serviceMonitor:
       enabled: true
 
 gitlab:
@@ -124,7 +122,10 @@ gitlab:
 
   gitlab-exporter:
     enabled: true
-    metrics: # TODO add Prometheus
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
 
   migrations:
     resources:
@@ -132,10 +133,16 @@ gitlab:
         cpu: 500m
         memory: 4G
 
+  sidekiq:
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+
   webservice:
     ingress:
-      enabled: false # Local setting in subchart must be overridden
-    metrics: # TODO add Prometheus
+      enabled: false
+    metrics:
       enabled: true
       port: 8083
       serviceMonitor:
@@ -143,6 +150,29 @@ gitlab:
     workhorse:
       metrics:
         enabled: true
+        serviceMonitor:
+          enabled: true
+
+  gitlab-pages:
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+
+  gitaly:
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+
+  # override to enable ssh
+  gitlab-shell:
+    enabled: true
+    sshDaemon: gitlab-sshd
+    metrics:
+      enabled: true
+      serviceMonitor:
+        enabled: true
 
 certmanager:
   install: false