diff --git a/airbyte/helm/airbyte/Chart.yaml b/airbyte/helm/airbyte/Chart.yaml
index 65672dc54..27c4acdc4 100644
--- a/airbyte/helm/airbyte/Chart.yaml
+++ b/airbyte/helm/airbyte/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: airbyte
 description: Unified data integration platform
 type: application
-version: 0.4.26
+version: 0.4.27
 appVersion: 0.50.33
 dependencies:
 - name: airbyte
diff --git a/airbyte/helm/airbyte/templates/runbooks.yaml b/airbyte/helm/airbyte/templates/runbooks.yaml
index 453202d01..80381bb64 100644
--- a/airbyte/helm/airbyte/templates/runbooks.yaml
+++ b/airbyte/helm/airbyte/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-server.+",image!="",container!=""}) by (pod)
   - name: worker-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-worker.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-worker.+",image!="",container!=""}) by (pod)
   - name: worker
     type: kubernetes
     kubernetes:
diff --git a/airflow/helm/airflow/Chart.yaml b/airflow/helm/airflow/Chart.yaml
index 91ceae622..ef417ba25 100644
--- a/airflow/helm/airflow/Chart.yaml
+++ b/airflow/helm/airflow/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: airflow
 description: A Helm chart for airflow deployable on plural
 type: application
-version: 0.3.42
+version: 0.3.43
 appVersion: "2.6.3"
 sources:
   - https://github.com/pluralsh/plural-artifacts/airflow/helm/airflow
diff --git a/airflow/helm/airflow/templates/runbooks.yaml b/airflow/helm/airflow/templates/runbooks.yaml
index 1ba8b547d..1b34a4876 100644
--- a/airflow/helm/airflow/templates/runbooks.yaml
+++ b/airflow/helm/airflow/templates/runbooks.yaml
@@ -28,7 +28,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-worker-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-worker-[0-9]+",image!="",container!=""}) by (pod)
   {{- end }}
   - name: web-cpu
     type: prometheus
@@ -41,7 +41,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-web-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-web-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   {{- if .Values.airflow.workers.enabled }}
   - name: worker
     type: kubernetes
diff --git a/argo-cd/helm/argo-cd/Chart.yaml b/argo-cd/helm/argo-cd/Chart.yaml
index 775d55317..5ebcb4f8c 100644
--- a/argo-cd/helm/argo-cd/Chart.yaml
+++ b/argo-cd/helm/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-cd
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: v2.9.3
 dependencies:
 - name: config-overlays
diff --git a/argo-cd/helm/argo-cd/templates/runbooks.yaml b/argo-cd/helm/argo-cd/templates/runbooks.yaml
index 2872f7438..4f08d1903 100644
--- a/argo-cd/helm/argo-cd/templates/runbooks.yaml
+++ b/argo-cd/helm/argo-cd/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-application-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-application-controller.+",image!="",container!=""}) by (pod)
   - name: argo-cd-reposerver-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-repo-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-repo-server.+",image!="",container!=""}) by (pod)
   - name: argo-cd-server-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-server.+",image!="",container!=""}) by (pod)
   - name: argo-cd-applicationset-controller-cpu
     type: prometheus
     prometheus:
@@ -58,7 +58,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-applicationset-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-applicationset-controller.+",image!="",container!=""}) by (pod)
   - name: argo-cd-notifications-controller-cpu
     type: prometheus
     prometheus:
@@ -70,7 +70,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-notifications-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-notifications-controller.+",image!="",container!=""}) by (pod)
   - name: controller
     type: kubernetes
     kubernetes:
diff --git a/chatwoot/helm/chatwoot/Chart.yaml b/chatwoot/helm/chatwoot/Chart.yaml
index 84172c56c..0b5f04698 100644
--- a/chatwoot/helm/chatwoot/Chart.yaml
+++ b/chatwoot/helm/chatwoot/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: chatwoot
 description: Open-source customer engagement suite, an alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 type: application
-version: 0.1.13
+version: 0.1.14
 appVersion: v3.7.0
 dependencies:
 - name: chatwoot
diff --git a/chatwoot/helm/chatwoot/templates/runbooks.yaml b/chatwoot/helm/chatwoot/templates/runbooks.yaml
index 939b2c00e..6338a2eb0 100644
--- a/chatwoot/helm/chatwoot/templates/runbooks.yaml
+++ b/chatwoot/helm/chatwoot/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-web.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-web.+",image!="",container!=""}) by (pod)
   - name: chatwoot-worker-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-worker.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-worker.+",image!="",container!=""}) by (pod)
   - name: chatwoot
     type: kubernetes
     kubernetes:
diff --git a/clickhouse/helm/clickhouse/Chart.yaml b/clickhouse/helm/clickhouse/Chart.yaml
index 41c008fea..1bfd98d66 100644
--- a/clickhouse/helm/clickhouse/Chart.yaml
+++ b/clickhouse/helm/clickhouse/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clickhouse
 description: helm chart for clickhouse
 type: application
-version: 0.1.4
+version: 0.1.5
 appVersion: 0.21.2
 dependencies:
 - name: altinity-clickhouse-operator
diff --git a/clickhouse/helm/clickhouse/templates/runbooks.yaml b/clickhouse/helm/clickhouse/templates/runbooks.yaml
index 504a740bf..02644c061 100644
--- a/clickhouse/helm/clickhouse/templates/runbooks.yaml
+++ b/clickhouse/helm/clickhouse/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "altinity-clickhouse-operator.fullname" (index .Subcharts "altinity-clickhouse-operator") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "altinity-clickhouse-operator.fullname" (index .Subcharts "altinity-clickhouse-operator") }}-.*",image!="",container!=""}) by (pod)
   - name: clickhouse-operator-deployment
     type: kubernetes
     kubernetes:
diff --git a/dagster/helm/dagster/Chart.yaml b/dagster/helm/dagster/Chart.yaml
index 8714605bf..6974d366f 100644
--- a/dagster/helm/dagster/Chart.yaml
+++ b/dagster/helm/dagster/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: dagster
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.48
+version: 0.1.49
 appVersion: 1.6.0
 dependencies:
 - name: postgres
diff --git a/dagster/helm/dagster/templates/runbooks.yaml b/dagster/helm/dagster/templates/runbooks.yaml
index 2a9d8489d..08e518996 100644
--- a/dagster/helm/dagster/templates/runbooks.yaml
+++ b/dagster/helm/dagster/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-daemon.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-daemon.+",image!="",container!=""}) by (pod)
   - name: dagster-dagit-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-dagit.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-dagit.+",image!="",container!=""}) by (pod)
   - name: dagster-daemon
     type: kubernetes
     kubernetes:
diff --git a/datahub/helm/datahub/Chart.yaml b/datahub/helm/datahub/Chart.yaml
index 7e37a7b3a..8e5f4191c 100644
--- a/datahub/helm/datahub/Chart.yaml
+++ b/datahub/helm/datahub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: datahub
 description: helm chart for datahub
 type: application
-version: 0.1.16
+version: 0.1.17
 appVersion: v0.10.3
 dependencies:
 - name: datahub
diff --git a/datahub/helm/datahub/templates/runbooks.yaml b/datahub/helm/datahub/templates/runbooks.yaml
index 86e660a4c..edd768b7e 100644
--- a/datahub/helm/datahub/templates/runbooks.yaml
+++ b/datahub/helm/datahub/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "acryl-datahub-actions.fullname" (index .Subcharts "datahub" "Subcharts" "acryl-datahub-actions") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "acryl-datahub-actions.fullname" (index .Subcharts "datahub" "Subcharts" "acryl-datahub-actions") }}-.*",image!="",container!=""}) by (pod)
   - name: frontend-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-frontend.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-frontend") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-frontend.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-frontend") }}-.*",image!="",container!=""}) by (pod)
   - name: gms-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-gms.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-gms") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-gms.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-gms") }}-.*",image!="",container!=""}) by (pod)
   - name: actions
     type: kubernetes
     kubernetes:
diff --git a/ghost/helm/ghost/Chart.yaml b/ghost/helm/ghost/Chart.yaml
index 90ca5b7a8..3be017d4f 100644
--- a/ghost/helm/ghost/Chart.yaml
+++ b/ghost/helm/ghost/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ghost
 description: A Helm chart for Kubernetes
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: "5.49.2"
 dependencies:
 - name: mysql
diff --git a/ghost/helm/ghost/templates/runbooks.yaml b/ghost/helm/ghost/templates/runbooks.yaml
index b112ba412..21eee3ab8 100644
--- a/ghost/helm/ghost/templates/runbooks.yaml
+++ b/ghost/helm/ghost/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"ghost-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"ghost-[0-9]+",image!="",container!=""}) by (pod)
   - name: statefulset
     type: kubernetes
     kubernetes:
diff --git a/gitlab/helm/gitlab/Chart.yaml b/gitlab/helm/gitlab/Chart.yaml
index 4311e303b..85aa1ddaf 100644
--- a/gitlab/helm/gitlab/Chart.yaml
+++ b/gitlab/helm/gitlab/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: gitlab
 description: A Helm chart for gitlab on plural
 type: application
-version: 0.5.13
+version: 0.5.14
 appVersion: 15.2.2
 dependencies:
 - name: gitlab
diff --git a/gitlab/helm/gitlab/templates/prometheusrule.yaml b/gitlab/helm/gitlab/templates/prometheusrule.yaml
index 667a7bd18..09566d763 100644
--- a/gitlab/helm/gitlab/templates/prometheusrule.yaml
+++ b/gitlab/helm/gitlab/templates/prometheusrule.yaml
@@ -25,7 +25,7 @@ spec:
     - alert: GitlabPostgresMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"plural-gitlab-[0-9]+"})
         )  > 1
       for: 5m
@@ -51,7 +51,7 @@ spec:
     - alert: GitlabGitalyMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitaly-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitaly-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"plural-gitaly-[0-9]+"})
         )  > 0.7
       for: 5m
diff --git a/gitlab/helm/gitlab/templates/runbooks.yaml b/gitlab/helm/gitlab/templates/runbooks.yaml
index 4b737556f..2de9fc61b 100644
--- a/gitlab/helm/gitlab/templates/runbooks.yaml
+++ b/gitlab/helm/gitlab/templates/runbooks.yaml
@@ -25,7 +25,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-webservice-default-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-webservice-default-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: gitaly-cpu
     type: prometheus
     prometheus:
@@ -37,7 +37,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-gitaly-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-gitaly-[0-9]+",image!="",container!=""}) by (pod)
   - name: sidekiq-cpu
     type: prometheus
     prometheus:
@@ -49,7 +49,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-sidekiq-all-in-1-v1-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-sidekiq-all-in-1-v1-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: web
     type: kubernetes
     kubernetes:
@@ -165,7 +165,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+",image!="",container!=""}) by (pod)
   - name: volume
     type: prometheus
     prometheus:
diff --git a/grafana/helm/grafana/Chart.yaml b/grafana/helm/grafana/Chart.yaml
index 5b1557435..1291e0da8 100644
--- a/grafana/helm/grafana/Chart.yaml
+++ b/grafana/helm/grafana/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: grafana
 description: A Helm chart for grafana on plural
 type: application
-version: 0.2.26
+version: 0.2.27
 appVersion: "9.4.3"
 dependencies:
 - name: grafana
diff --git a/grafana/helm/grafana/templates/runbooks.yaml b/grafana/helm/grafana/templates/runbooks.yaml
index 6b78a2407..f92494a09 100644
--- a/grafana/helm/grafana/templates/runbooks.yaml
+++ b/grafana/helm/grafana/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"grafana-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"grafana-[0-9]+",image!="",container!=""}) by (pod)
   - name: statefulset
     type: kubernetes
     kubernetes:
diff --git a/harbor/helm/harbor/Chart.yaml b/harbor/helm/harbor/Chart.yaml
index 02069ca02..fddc32c95 100644
--- a/harbor/helm/harbor/Chart.yaml
+++ b/harbor/helm/harbor/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: harbor
 description: helm chart for harbor
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: v2.8.1
 dependencies:
 - name: postgres
diff --git a/harbor/helm/harbor/templates/runbooks.yaml b/harbor/helm/harbor/templates/runbooks.yaml
index 7f350edd5..97b477098 100644
--- a/harbor/helm/harbor/templates/runbooks.yaml
+++ b/harbor/helm/harbor/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.core" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.core" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: jobservice-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.jobservice" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.jobservice" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: registry-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.registry" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.registry" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: portal-cpu
     type: prometheus
     prometheus:
@@ -58,7 +58,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.portal" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.portal" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: trivy-cpu
     type: prometheus
     prometheus:
@@ -70,7 +70,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.trivy" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.trivy" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: notary-server-cpu
     type: prometheus
     prometheus:
@@ -82,7 +82,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-server" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-server" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: notary-signer-cpu
     type: prometheus
     prometheus:
@@ -94,7 +94,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-signer" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-signer" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: exporter-cpu
     type: prometheus
     prometheus:
@@ -106,7 +106,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.exporter" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.exporter" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: core
     type: kubernetes
     kubernetes:
diff --git a/influx/helm/influx/Chart.yaml b/influx/helm/influx/Chart.yaml
index 3232f33f0..c3a69eea1 100644
--- a/influx/helm/influx/Chart.yaml
+++ b/influx/helm/influx/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: influx
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.27
+version: 0.1.28
 appVersion: "1.16.0"
 dependencies:
 - name: chronograf
diff --git a/influx/helm/influx/templates/prometheusrule.yaml b/influx/helm/influx/templates/prometheusrule.yaml
index dc1f8dda7..ccfe64851 100644
--- a/influx/helm/influx/templates/prometheusrule.yaml
+++ b/influx/helm/influx/templates/prometheusrule.yaml
@@ -26,7 +26,7 @@ spec:
     - alert: InfluxDbMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influxdb-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influxdb-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"influxdb-[0-9]+"})
         )  > 0.5
       for: 5m
diff --git a/influx/helm/influx/templates/runbooks.yaml b/influx/helm/influx/templates/runbooks.yaml
index 93ec5b6cc..e0118b337 100644
--- a/influx/helm/influx/templates/runbooks.yaml
+++ b/influx/helm/influx/templates/runbooks.yaml
@@ -25,7 +25,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influxdb-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influxdb-[0-9]+",image!="",container!=""}) by (pod)
   - name: kap-cpu
     type: prometheus
     prometheus:
@@ -37,7 +37,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influx-kapacitor-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influx-kapacitor-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: chron-cpu
     type: prometheus
     prometheus:
@@ -49,7 +49,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influx-chronograf-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"influx-chronograf-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: influx
     type: kubernetes
     kubernetes:
diff --git a/jupyterhub/helm/jupyterhub/Chart.yaml b/jupyterhub/helm/jupyterhub/Chart.yaml
index 31a31268b..bb8a5d3de 100644
--- a/jupyterhub/helm/jupyterhub/Chart.yaml
+++ b/jupyterhub/helm/jupyterhub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: jupyterhub
 description: helm chart for jupyterhub
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: "3.1.1"
 maintainers:
   - name: Samuel Gordalina
diff --git a/jupyterhub/helm/jupyterhub/templates/runbooks.yaml b/jupyterhub/helm/jupyterhub/templates/runbooks.yaml
index aa4b3fe4f..4fe65b816 100644
--- a/jupyterhub/helm/jupyterhub/templates/runbooks.yaml
+++ b/jupyterhub/helm/jupyterhub/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "jupyterhub-plural.fullname" . }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "jupyterhub-plural.fullname" . }}.+",image!="",container!=""}) by (pod)
   - name: jupyterhub
     type: kubernetes
     kubernetes:
diff --git a/kafka/helm/kafka/Chart.yaml b/kafka/helm/kafka/Chart.yaml
index c4ee7a19b..876626087 100644
--- a/kafka/helm/kafka/Chart.yaml
+++ b/kafka/helm/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kafka
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion: "3.4.0"
 dependencies:
 - name: strimzi-kafka-operator
diff --git a/kafka/helm/kafka/templates/runbooks.yaml b/kafka/helm/kafka/templates/runbooks.yaml
index 727821c00..8b1d8178e 100644
--- a/kafka/helm/kafka/templates/runbooks.yaml
+++ b/kafka/helm/kafka/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"kafka-kafka-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"kafka-kafka-[0-9]+",image!="",container!=""}) by (pod)
   - name: zk-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"kafka-zookeeper-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"kafka-zookeeper-[0-9]+",image!="",container!=""}) by (pod)
   - name: kafka
     type: kubernetes
     kubernetes:
diff --git a/lightdash/helm/lightdash/Chart.yaml b/lightdash/helm/lightdash/Chart.yaml
index 41a3283fd..c5254eadc 100644
--- a/lightdash/helm/lightdash/Chart.yaml
+++ b/lightdash/helm/lightdash/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: lightdash
 description: helm chart for lightdash
 type: application
-version: 0.1.5
+version: 0.1.6
 appVersion: v0.530.0
 dependencies:
   - name: lightdash
diff --git a/lightdash/helm/lightdash/templates/runbooks.yaml b/lightdash/helm/lightdash/templates/runbooks.yaml
index 2441faac7..50892a775 100644
--- a/lightdash/helm/lightdash/templates/runbooks.yaml
+++ b/lightdash/helm/lightdash/templates/runbooks.yaml
@@ -25,7 +25,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(rate(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"lightdash.+",pod!~".+browserless.+"}[5m])) by (pod)
+      query: sum(rate(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"lightdash.+",pod!~".+browserless.+",image!="",container!=""}[5m])) by (pod)
   - name: cpu-browserless
     type: prometheus
     prometheus:
@@ -37,7 +37,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(rate(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"lightdash-browserless-chrome.+"}[5m])) by (pod)
+      query: sum(rate(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"lightdash-browserless-chrome.+",image!="",container!=""}[5m])) by (pod)
   - name: deployment
     type: kubernetes
     kubernetes:
diff --git a/mongodb/helm/mongodb-community/Chart.yaml b/mongodb/helm/mongodb-community/Chart.yaml
index 53ce57ede..747441028 100644
--- a/mongodb/helm/mongodb-community/Chart.yaml
+++ b/mongodb/helm/mongodb-community/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mongodb-community
 description: helm chart for mongodb community operator
 type: application
-version: 0.1.7
+version: 0.1.8
 appVersion: "v1.0.0"
 dependencies:
 - name: community-operator
diff --git a/mongodb/helm/mongodb-community/templates/prometheusrule.yaml b/mongodb/helm/mongodb-community/templates/prometheusrule.yaml
index f1892ceac..1021de4a4 100644
--- a/mongodb/helm/mongodb-community/templates/prometheusrule.yaml
+++ b/mongodb/helm/mongodb-community/templates/prometheusrule.yaml
@@ -25,7 +25,7 @@ spec:
     - alert: MongoMem
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"mongo-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"mongo-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"mongo-[0-9]+"})
         )  > 0.5
       for: 5m
diff --git a/monitoring/helm/monitoring/Chart.yaml b/monitoring/helm/monitoring/Chart.yaml
index ccd1997d8..82102921f 100644
--- a/monitoring/helm/monitoring/Chart.yaml
+++ b/monitoring/helm/monitoring/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: monitoring
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.29
+version: 0.2.30
 appVersion: "0.1.0"
 dependencies:
 - name: kube-prometheus-stack
diff --git a/monitoring/helm/monitoring/templates/prometheusrule.yaml b/monitoring/helm/monitoring/templates/prometheusrule.yaml
index 420273d98..0278ef3bb 100644
--- a/monitoring/helm/monitoring/templates/prometheusrule.yaml
+++ b/monitoring/helm/monitoring/templates/prometheusrule.yaml
@@ -26,7 +26,7 @@ spec:
     - alert: PrometheusMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"prometheus-monitoring-prometheus-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"prometheus-monitoring-prometheus-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"prometheus-monitoring-prometheus-[0-9]+"})
         )  > 1.1
       for: 5m
@@ -67,7 +67,7 @@ spec:
     - alert: LokiMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"monitoring-loki-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"monitoring-loki-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"monitoring-loki-[0-9]+"})
         )  > 0.9
       for: 5m
diff --git a/monitoring/helm/monitoring/templates/runbooks.yaml b/monitoring/helm/monitoring/templates/runbooks.yaml
index f829b2405..75138f0c8 100644
--- a/monitoring/helm/monitoring/templates/runbooks.yaml
+++ b/monitoring/helm/monitoring/templates/runbooks.yaml
@@ -27,7 +27,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"prometheus-monitoring-prometheus-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"prometheus-monitoring-prometheus-[0-9]+",image!="",container!=""}) by (pod)
   - name: loki-cpu
     type: prometheus
     prometheus:
@@ -39,7 +39,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"monitoring-loki-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"monitoring-loki-[0-9]+",image!="",container!=""}) by (pod)
   - name: prometheus
     type: kubernetes
     kubernetes:
diff --git a/n8n/helm/n8n/Chart.yaml b/n8n/helm/n8n/Chart.yaml
index b8a2b62ed..09407b3ce 100644
--- a/n8n/helm/n8n/Chart.yaml
+++ b/n8n/helm/n8n/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: n8n
 description: helm chart for n8n
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "1.5.1"
 dependencies:
 - name: postgres
diff --git a/n8n/helm/n8n/templates/runbook.yaml b/n8n/helm/n8n/templates/runbook.yaml
index 51dae4469..4a5ce4505 100644
--- a/n8n/helm/n8n/templates/runbook.yaml
+++ b/n8n/helm/n8n/templates/runbook.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-worker-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-worker-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: web-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-[a-z0-9]{10}-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-[a-z0-9]{10}-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: webhook-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-webhook-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"n8n-k8s-webhook-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: worker
     type: kubernetes
     kubernetes:
diff --git a/posthog/helm/posthog/Chart.yaml b/posthog/helm/posthog/Chart.yaml
index f5ed2e2b4..d41b3d525 100644
--- a/posthog/helm/posthog/Chart.yaml
+++ b/posthog/helm/posthog/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: posthog
 description: helm chart for posthog
 type: application
-version: 0.1.11
+version: 0.1.12
 appVersion: "1.43.1"
 dependencies:
 - name: posthog
diff --git a/posthog/helm/posthog/templates/clickhouse-runbook.yaml b/posthog/helm/posthog/templates/clickhouse-runbook.yaml
index a59522e68..8b2bf4b90 100644
--- a/posthog/helm/posthog/templates/clickhouse-runbook.yaml
+++ b/posthog/helm/posthog/templates/clickhouse-runbook.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chi-{{ template "posthog-plural.name" . }}-clickhouse-posthog-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chi-{{ template "posthog-plural.name" . }}-clickhouse-posthog-.*",image!="",container!=""}) by (pod)
   - name: volume
     type: prometheus
     prometheus:
diff --git a/posthog/helm/posthog/templates/posthog-runbook.yaml b/posthog/helm/posthog/templates/posthog-runbook.yaml
index 7b2ab299c..5301a6700 100644
--- a/posthog/helm/posthog/templates/posthog-runbook.yaml
+++ b/posthog/helm/posthog/templates/posthog-runbook.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-events-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-events-.*",image!="",container!=""}) by (pod)
   - name: plugins-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-plugins-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-plugins-.*",image!="",container!=""}) by (pod)
   - name: web-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-web-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-web-.*",image!="",container!=""}) by (pod)
   - name: worker-cpu
     type: prometheus
     prometheus:
@@ -58,7 +58,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-worker-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "posthog.fullname" .Subcharts.posthog }}-worker-.*",image!="",container!=""}) by (pod)
   - name: events
     type: kubernetes
     kubernetes:
diff --git a/prefect-agent/helm/prefect-agent/Chart.yaml b/prefect-agent/helm/prefect-agent/Chart.yaml
index 2654356a5..c08d25ae4 100644
--- a/prefect-agent/helm/prefect-agent/Chart.yaml
+++ b/prefect-agent/helm/prefect-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prefect-agent
 description: helm chart for prefect-agent
 type: application
-version: 0.1.5
+version: 0.1.6
 appVersion: v2.10.12
 dependencies:
 - name: prefect-agent
diff --git a/prefect-agent/helm/prefect-agent/templates/runbooks.yaml b/prefect-agent/helm/prefect-agent/templates/runbooks.yaml
index 1ddfa3330..c41301bce 100644
--- a/prefect-agent/helm/prefect-agent/templates/runbooks.yaml
+++ b/prefect-agent/helm/prefect-agent/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-agent") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-agent") }}.+",image!="",container!=""}) by (pod)
   - name: agent
     type: kubernetes
     kubernetes:
diff --git a/prefect-worker/helm/prefect-worker/Chart.yaml b/prefect-worker/helm/prefect-worker/Chart.yaml
index 7b7ab84b3..0e04616c1 100644
--- a/prefect-worker/helm/prefect-worker/Chart.yaml
+++ b/prefect-worker/helm/prefect-worker/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prefect-worker
 description: helm chart for prefect-worker
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: v2.10.12
 dependencies:
 - name: prefect-worker
diff --git a/prefect-worker/helm/prefect-worker/templates/runbooks.yaml b/prefect-worker/helm/prefect-worker/templates/runbooks.yaml
index 1064105dd..8be55983d 100644
--- a/prefect-worker/helm/prefect-worker/templates/runbooks.yaml
+++ b/prefect-worker/helm/prefect-worker/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-worker") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-worker") }}.+",image!="",container!=""}) by (pod)
   - name: worker
     type: kubernetes
     kubernetes:
diff --git a/prefect-worker/helm/prefect-worker/templates/tests/runbooks.yaml b/prefect-worker/helm/prefect-worker/templates/tests/runbooks.yaml
index 6eb704b53..3dc32e35c 100644
--- a/prefect-worker/helm/prefect-worker/templates/tests/runbooks.yaml
+++ b/prefect-worker/helm/prefect-worker/templates/tests/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-worker") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-worker") }}.+",image!="",container!=""}) by (pod)
   - name: worker
     type: kubernetes
     kubernetes:
diff --git a/prefect/helm/prefect/Chart.yaml b/prefect/helm/prefect/Chart.yaml
index 4a6a931dd..f4b0146da 100644
--- a/prefect/helm/prefect/Chart.yaml
+++ b/prefect/helm/prefect/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: prefect
 description: helm chart for prefect server
 type: application
-version: 0.2.5
+version: 0.2.6
 appVersion: v2.10.12
 dependencies:
 - name: config-overlays
diff --git a/prefect/helm/prefect/templates/runbooks.yaml b/prefect/helm/prefect/templates/runbooks.yaml
index 8020bfad1..bcc9b7b63 100644
--- a/prefect/helm/prefect/templates/runbooks.yaml
+++ b/prefect/helm/prefect/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-server") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-server") }}.+",image!="",container!=""}) by (pod)
   - name: prefect-agent-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-agent") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "common.names.fullname" (index .Subcharts "prefect-agent") }}.+",image!="",container!=""}) by (pod)
   - name: server
     type: kubernetes
     kubernetes:
diff --git a/rabbitmq/helm/cluster-operator/Chart.yaml b/rabbitmq/helm/cluster-operator/Chart.yaml
index 3453accff..21ac87ef3 100644
--- a/rabbitmq/helm/cluster-operator/Chart.yaml
+++ b/rabbitmq/helm/cluster-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cluster-operator
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.20
+version: 0.1.21
 appVersion: 2.2.0
 dependencies:
 - name: rabbitmq-cluster-operator
diff --git a/rabbitmq/helm/cluster-operator/templates/prometheusrules.yaml b/rabbitmq/helm/cluster-operator/templates/prometheusrules.yaml
index 233e7b03b..477c0920c 100644
--- a/rabbitmq/helm/cluster-operator/templates/prometheusrules.yaml
+++ b/rabbitmq/helm/cluster-operator/templates/prometheusrules.yaml
@@ -25,7 +25,7 @@ spec:
     - alert: RabbitmqMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"rabbitmq-server-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"rabbitmq-server-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"rabbitmq-server-[0-9]+"})
         )  > 0.7
       for: 5m
diff --git a/rabbitmq/helm/cluster-operator/templates/runbooks.yaml b/rabbitmq/helm/cluster-operator/templates/runbooks.yaml
index d5dce11b3..d3b390d6a 100644
--- a/rabbitmq/helm/cluster-operator/templates/runbooks.yaml
+++ b/rabbitmq/helm/cluster-operator/templates/runbooks.yaml
@@ -25,7 +25,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="rabbitmq",pod=~"rabbitmq-server-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="rabbitmq",pod=~"rabbitmq-server-[0-9]+",image!="",container!=""}) by (pod)
   - name: statefulset
     type: kubernetes
     kubernetes:
diff --git a/redis/helm/redis/Chart.yaml b/redis/helm/redis/Chart.yaml
index f45ff9400..2eb56cc41 100644
--- a/redis/helm/redis/Chart.yaml
+++ b/redis/helm/redis/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: redis
 description: Redis deployable on plural
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: 7.0.11
 dependencies:
 - name: redis
diff --git a/redis/helm/redis/templates/prometheusrules.yaml b/redis/helm/redis/templates/prometheusrules.yaml
index 05810fd6e..c92033e56 100644
--- a/redis/helm/redis/templates/prometheusrules.yaml
+++ b/redis/helm/redis/templates/prometheusrules.yaml
@@ -25,7 +25,7 @@ spec:
     - alert: RedisMasterMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-master-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-master-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"redis-master-[0-9]+"})
         )  > 0.7
       for: 5m
@@ -51,7 +51,7 @@ spec:
     - alert: RedisReplicasMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-replicas-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-replicas-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"redis-replicas-[0-9]+"})
         )  > 0.7
       for: 5m
diff --git a/redis/helm/redis/templates/runbooks.yaml b/redis/helm/redis/templates/runbooks.yaml
index c500b41da..21e6fb920 100644
--- a/redis/helm/redis/templates/runbooks.yaml
+++ b/redis/helm/redis/templates/runbooks.yaml
@@ -27,7 +27,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-master-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-master-[0-9]+",image!="",container!=""}) by (pod)
   - name: replica-cpu
     type: prometheus
     prometheus:
@@ -39,7 +39,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-replicas-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"redis-replicas-[0-9]+",image!="",container!=""}) by (pod)
   - name: master
     type: kubernetes
     kubernetes:
diff --git a/redpanda/helm/redpanda/Chart.yaml b/redpanda/helm/redpanda/Chart.yaml
index 691aaff5c..5ba2cced1 100644
--- a/redpanda/helm/redpanda/Chart.yaml
+++ b/redpanda/helm/redpanda/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: redpanda
 description: helm chart for redpanda
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "v23.1.3"
 maintainers:
   - name: Samuel Gordalina
diff --git a/redpanda/helm/redpanda/templates/runbooks.yaml b/redpanda/helm/redpanda/templates/runbooks.yaml
index c7d395cd2..7cb8f492b 100644
--- a/redpanda/helm/redpanda/templates/runbooks.yaml
+++ b/redpanda/helm/redpanda/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "redpanda.fullname" . }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "redpanda.fullname" . }}.+",image!="",container!=""}) by (pod)
   - name: redpanda
     type: kubernetes
     kubernetes:
diff --git a/renovate-on-prem/helm/renovate-on-prem/Chart.yaml b/renovate-on-prem/helm/renovate-on-prem/Chart.yaml
index ab89abf65..e1fa64345 100644
--- a/renovate-on-prem/helm/renovate-on-prem/Chart.yaml
+++ b/renovate-on-prem/helm/renovate-on-prem/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: renovate-on-prem
 description: helm chart for renovate-on-prem
 type: application
-version: 0.3.0
+version: 0.3.1
 appVersion: 6.1.1
 dependencies:
 - name: mend-renovate-ce
diff --git a/renovate-on-prem/helm/renovate-on-prem/templates/runbooks.yaml b/renovate-on-prem/helm/renovate-on-prem/templates/runbooks.yaml
index 57ed2daef..b5586e98e 100644
--- a/renovate-on-prem/helm/renovate-on-prem/templates/runbooks.yaml
+++ b/renovate-on-prem/helm/renovate-on-prem/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "mend-renovate.fullname" (index .Subcharts "mend-renovate-ce") }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "mend-renovate.fullname" (index .Subcharts "mend-renovate-ce") }}.+",image!="",container!=""}) by (pod)
   - name: renovate
     type: kubernetes
     kubernetes:
diff --git a/strapi/helm/strapi/Chart.yaml b/strapi/helm/strapi/Chart.yaml
index 3399bf839..c85fa3565 100644
--- a/strapi/helm/strapi/Chart.yaml
+++ b/strapi/helm/strapi/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: strapi
 description: helm chart for strapi
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: "4.2.0"
 dependencies:
 - name: postgres
diff --git a/strapi/helm/strapi/templates/runbooks.yaml b/strapi/helm/strapi/templates/runbooks.yaml
index 0d52e3e94..67a24671a 100644
--- a/strapi/helm/strapi/templates/runbooks.yaml
+++ b/strapi/helm/strapi/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "strapi.fullname" . }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "strapi.fullname" . }}.+",image!="",container!=""}) by (pod)
   - name: strapi
     type: kubernetes
     kubernetes:
diff --git a/tier/helm/tier/Chart.yaml b/tier/helm/tier/Chart.yaml
index 0b497cca9..554dabe7c 100644
--- a/tier/helm/tier/Chart.yaml
+++ b/tier/helm/tier/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tier
 description: helm chart for tier
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: "v0.10.0"
 maintainers:
   - name: Samuel Gordalina
diff --git a/tier/helm/tier/templates/runbooks.yaml b/tier/helm/tier/templates/runbooks.yaml
index 6ca0d3071..3bee2543d 100644
--- a/tier/helm/tier/templates/runbooks.yaml
+++ b/tier/helm/tier/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "tier.fullname" . }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "tier.fullname" . }}.+",image!="",container!=""}) by (pod)
   - name: tier
     type: kubernetes
     kubernetes:
diff --git a/typesense/helm/typesense/Chart.yaml b/typesense/helm/typesense/Chart.yaml
index 9ca860d66..2294bc2fd 100644
--- a/typesense/helm/typesense/Chart.yaml
+++ b/typesense/helm/typesense/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: typesense
 description: helm chart for typesense
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: "0.25.0.rc34"
diff --git a/typesense/helm/typesense/templates/runbooks.yaml b/typesense/helm/typesense/templates/runbooks.yaml
index fff28528b..5a623a606 100644
--- a/typesense/helm/typesense/templates/runbooks.yaml
+++ b/typesense/helm/typesense/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "typesense.fullname" . }}.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ include "typesense.fullname" . }}.+",image!="",container!=""}) by (pod)
   - name: typesense
     type: kubernetes
     kubernetes:
diff --git a/yatai/helm/yatai/Chart.yaml b/yatai/helm/yatai/Chart.yaml
index 1b952d692..5cff0e385 100644
--- a/yatai/helm/yatai/Chart.yaml
+++ b/yatai/helm/yatai/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: yatai
 description: helm chart for yatai
 type: application
-version: 0.1.6
+version: 0.1.7
 appVersion: "v1.1.9"
 dependencies:
 - name: postgres
diff --git a/yatai/helm/yatai/templates/runbooks.yaml b/yatai/helm/yatai/templates/runbooks.yaml
index fe7839a1a..46203be8d 100644
--- a/yatai/helm/yatai/templates/runbooks.yaml
+++ b/yatai/helm/yatai/templates/runbooks.yaml
@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai.fullname" .Subcharts.yatai }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai.fullname" .Subcharts.yatai }}-.*",image!="",container!=""}) by (pod)
   - name: yatai-deployment-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai-deployment.fullname" (index .Subcharts "yatai-deployment") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai-deployment.fullname" (index .Subcharts "yatai-deployment") }}-.*",image!="",container!=""}) by (pod)
   - name: yatai-image-builder-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai-image-builder.fullname" (index .Subcharts "yatai-image-builder") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "yatai-image-builder.fullname" (index .Subcharts "yatai-image-builder") }}-.*",image!="",container!=""}) by (pod)
   - name: yatai
     type: kubernetes
     kubernetes: