diff --git a/helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl b/helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl
new file mode 100644
index 000000000..483433098
--- /dev/null
+++ b/helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl
@@ -0,0 +1,30 @@
+{{/*
+Copyright 2017 The Openstack-Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+# Appends annotations for configuring prometheus scrape jobs via pod
+# annotations. The required annotations are:
+# * `prometheus.io/scrape`: Only scrape pods that have a value of `true`
+# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
+# * `prometheus.io/port`: Scrape the pod on the indicated port instead of the
+# pod's declared ports (default is a port-free target if none are declared).
+
+{{- define "helm-toolkit.snippets.prometheus_pod_annotations" -}}
+{{- $pod := index . 0 -}}
+{{- $context := index . 1 -}}
+prometheus.io/scrape: {{ $pod.scrape | quote }}
+prometheus.io/path: {{ $pod.path.default | quote }}
+prometheus.io/port: {{ $pod.scrape_port | quote }}
+{{- end -}}
diff --git a/helm-toolkit/templates/snippets/_prometheus_metadata_annotations.tpl b/helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl
similarity index 67%
rename from helm-toolkit/templates/snippets/_prometheus_metadata_annotations.tpl
rename to helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl
index 9f54f4470..a9ef94b93 100644
--- a/helm-toolkit/templates/snippets/_prometheus_metadata_annotations.tpl
+++ b/helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl
@@ -31,18 +31,3 @@ prometheus.io/scheme: {{ $endpoint.scheme.default | quote }}
 prometheus.io/path: {{ $endpoint.path.default | quote }}
 prometheus.io/port: {{ $endpoint.scrape_port | quote }}
 {{- end -}}
-
-# Appends annotations for configuring prometheus scrape jobs via pod
-# annotations. The required annotations are:
-# * `prometheus.io/scrape`: Only scrape pods that have a value of `true`
-# * `prometheus.io/path`: If the metrics path is not `/metrics` override this.
-# * `prometheus.io/port`: Scrape the pod on the indicated port instead of the
-# pod's declared ports (default is a port-free target if none are declared).
-
-{{- define "helm-toolkit.snippets.prometheus_pod_annotations" -}}
-{{- $pod := index . 0 -}}
-{{- $context := index . 1 -}}
-prometheus.io/scrape: {{ $pod.scrape | quote }}
-prometheus.io/path: {{ $pod.path.default | quote }}
-prometheus.io/port: {{ $pod.scrape_port | quote }}
-{{- end -}}