diff --git a/features/canary/prometheus/kustomization.yml b/features/canary/prometheus/kustomization.yml
index e38fc80..f6005b8 100644
--- a/features/canary/prometheus/kustomization.yml
+++ b/features/canary/prometheus/kustomization.yml
@@ -1,25 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
-resources:
-  - prometheus-grafana.yml
-
 patchesStrategicMerge:
   - spinnaker-config.yml
 
-configMapGenerator:
-  - name: grafana-dashboard-spinnaker
-    files:
-      - spinnaker-dashboards.json
-
-secretGenerator:
-  - name: prometheus-secrets
-    literals:
-      - grafanaDefaultUser=DefaultUser1!
-      - grafanaDefaultPassword=DefaultPass1!
-
-generatorOptions:
-  disableNameSuffixHash: true
-
 transformers:
   - tfr-namespace-roles.yml
diff --git a/features/operations/observability/prometheus/kustomization.yml b/features/operations/observability/prometheus/kustomization.yml
new file mode 100644
index 0000000..e9ca298
--- /dev/null
+++ b/features/operations/observability/prometheus/kustomization.yml
@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patchesStrategicMerge:
+  - spinnaker-config.yml
+
+configMapGenerator:
+  - name: grafana-dashboard-spinnaker
+    files:
+      - spinnaker-dashboards.json
+    options:
+      disableNameSuffixHash: true
diff --git a/accounts/metric-stores/patch-prometheus.yml b/features/operations/observability/prometheus/spinnaker-config.yml
similarity index 60%
rename from accounts/metric-stores/patch-prometheus.yml
rename to features/operations/observability/prometheus/spinnaker-config.yml
index 0cffb1f..96232e8 100644
--- a/accounts/metric-stores/patch-prometheus.yml
+++ b/features/operations/observability/prometheus/spinnaker-config.yml
@@ -7,17 +7,17 @@ metadata:
   name: spinnaker
 spec:
   spinnakerConfig:
-    config:
-      metricStores:
-        prometheus:
-          enabled: true
-          add_source_metalabels: true
+    #config:
+      #metricStores:
+        #prometheus:
+          #enabled: true
+          #add_source_metalabels: true
 
 #    # Config used if prometheus server discover pods through annotations
-#    service-settings:
-#      spinnaker:
-#        kubernetes:
-#          podAnnotations:
-#            prometheus.io/scrape: true
-#            prometheus.io/path: /prometheus_metrics
-#            prometheus.io/port: 8008
+    service-settings:
+      spinnaker:
+        kubernetes:
+          podAnnotations:
+            prometheus.io/scrape: true
+            prometheus.io/path: /prometheus_metrics
+            prometheus.io/port: 8008
diff --git a/features/canary/prometheus/spinnaker-dashboards.json b/features/operations/observability/prometheus/spinnaker-dashboards.json
similarity index 100%
rename from features/canary/prometheus/spinnaker-dashboards.json
rename to features/operations/observability/prometheus/spinnaker-dashboards.json
diff --git a/third-party/README.md b/third-party/README.md
new file mode 100644
index 0000000..598d7a2
--- /dev/null
+++ b/third-party/README.md
@@ -0,0 +1,4 @@
+# third-party
+
+This directory contains components that build or configure third-party tools
+that interact with Spinnaker.
diff --git a/third-party/prometheus/kustomization.yml b/third-party/prometheus/kustomization.yml
new file mode 100644
index 0000000..415c3f5
--- /dev/null
+++ b/third-party/prometheus/kustomization.yml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - prometheus-grafana.yml
+
+secretGenerator:
+  - name: prometheus-secrets
+    literals:
+      - grafanaDefaultUser=DefaultUser1!
+      - grafanaDefaultPassword=DefaultPass1!
+    options:
+      disableNameSuffixHash: true
diff --git a/features/canary/prometheus/prometheus-grafana.yml b/third-party/prometheus/prometheus-grafana.yml
similarity index 100%
rename from features/canary/prometheus/prometheus-grafana.yml
rename to third-party/prometheus/prometheus-grafana.yml