diff --git a/charts/celo/README.md b/charts/celo/README.md
index a73d005b..77645700 100644
--- a/charts/celo/README.md
+++ b/charts/celo/README.md
@@ -65,7 +65,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | celo.initChownData.enabled | Init container to set the correct permissions to access data directories | bool | `true` |
  | celo.initChownData.image.pullPolicy | Container pull policy | string | `"IfNotPresent"` |
  | celo.initChownData.image.repository | Container repository | string | `"busybox"` |
- | celo.initChownData.image.tag | Container tag | string | `"1.36.1"` |
+ | celo.initChownData.image.tag | Container tag | string | `"1.37.0"` |
  | celo.nodeSelector |  | object | `{}` |
  | celo.p2pNodePort.enabled | Expose P2P port via NodePort | bool | `false` |
  | celo.p2pNodePort.initContainer.image.pullPolicy | Container pull policy | string | `"IfNotPresent"` |
diff --git a/charts/celo/values.yaml b/charts/celo/values.yaml
index 9602ed00..69e286b8 100644
--- a/charts/celo/values.yaml
+++ b/charts/celo/values.yaml
@@ -160,6 +160,6 @@ celo:
       # -- Container repository
       repository: busybox
       # -- Container tag
-      tag: "1.36.1"
+      tag: "1.37.0"
       # -- Container pull policy
       pullPolicy: IfNotPresent
diff --git a/charts/firehose-ethereum/README.md b/charts/firehose-ethereum/README.md
index 7eb2bab4..67f69005 100644
--- a/charts/firehose-ethereum/README.md
+++ b/charts/firehose-ethereum/README.md
@@ -243,7 +243,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | firehoseComponentDefaults.rbac | RBAC role and binding configuration | object | `{"bindingSpec":{"metadata":{"annotations":{},"labels":{}},"roleRef":{}},"enabled":"{{ .Pod.serviceAccount.enabled }}","roleSpec":{"metadata":{"annotations":{},"labels":{}}}}` |
  | firehoseComponentDefaults.resources | Resource requests and limits | object | `{}` |
  | firehoseComponentDefaults.securityContext | Container level security context overrides | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true}` |
- | firehoseComponentDefaults.service | Service customization | object | `{"enabled":true,"metadata":{"annotations":{},"labels":{},"name":"{{ include \"metadata.fullname\" $ }}-{{ .componentName }}"},"spec":{"ports":{"fh-metrics":{"port":"{{ with .Pod.fireeth.metrics }}{{ .enabled \| ternary (printf \"%d\" ( .port \| int ) ) nil }}{{ end }}","protocol":"{{ with .Pod.fireeth.metrics }}{{ .enabled \| ternary \"TCP\" nil }}{{ end }}"},"fh-pprof":{"port":"{{ with .Pod.fireeth.pprof }}{{ .enabled \| ternary (printf \"%d\" ( .port \| int ) ) nil }}{{ end }}","protocol":"{{ with .Pod.fireeth.pprof }}{{ .enabled \| ternary \"TCP\" nil }}{{ end }}"}},"type":"ClusterIP"}}` |
+ | firehoseComponentDefaults.service | Service customization | object | `{"enabled":true,"metadata":{"annotations":{},"labels":{}},"spec":{"ports":{"fh-metrics":{"port":"{{ with .Pod.fireeth.metrics }}{{ .enabled \| ternary (printf \"%d\" ( .port \| int ) ) nil }}{{ end }}","protocol":"{{ with .Pod.fireeth.metrics }}{{ .enabled \| ternary \"TCP\" nil }}{{ end }}"},"fh-pprof":{"port":"{{ with .Pod.fireeth.pprof }}{{ .enabled \| ternary (printf \"%d\" ( .port \| int ) ) nil }}{{ end }}","protocol":"{{ with .Pod.fireeth.pprof }}{{ .enabled \| ternary \"TCP\" nil }}{{ end }}"}},"type":"ClusterIP"}}` |
  | firehoseComponentDefaults.service.enabled | Create a Service | bool | `true` |
  | firehoseComponentDefaults.service.metadata.annotations | Additional service annotations | object | `{}` |
  | firehoseComponentDefaults.service.metadata.labels | Additional service labels | object | `{}` |
@@ -258,7 +258,6 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
  | firehoseComponentDefaults.serviceHeadless | Also create headless services, mandatory for StatefulSets and true by default | string | `"{{ eq .Pod.kind \"StatefulSet\" \| ternary true true }}"` |
  | firehoseComponentDefaults.serviceMonitor | ServiceMonitor configuration for Prometheus Operator | object | `{"enabled":true,"metadata":{"annotations":{},"labels":{}},"spec":{"endpoints":{"metrics-fh":{"honorLabels":true,"interval":"30s","path":"/metrics","scrapeTimeout":"10s"}}}}` |
  | firehoseComponentDefaults.serviceMonitor.enabled | Enable monitoring by creating `ServiceMonitor` CRDs ([prometheus-operator](https://github.com/prometheus-operator/prometheus-operator)) | bool | `true` |
- | firehoseComponentDefaults.serviceName | Required for StatefulSets | string | `"{{ include \"metadata.fullname\" $ }}-{{ .componentName }}-headless"` |
  | firehoseComponentDefaults.serviceP2P | Creates a NodePort service (used in P2P support) if a nodePort isn't specified, kubernetes will dinamically attribute one | object | `{"enabled":"{{ default false .Pod.fireeth.p2p.enabled }}","metadata":{"annotations":{},"labels":{}},"spec":{"ports":{"p2p-tcp":{"nodePort":null,"port":"{{ with .Pod.serviceP2P.spec.ports }}{{ default (30303 \| int) (index . \"p2p-tcp\" \"nodePort\" \| int) }}{{ end }}","protocol":"TCP","targetPort":null},"p2p-udp":{"nodePort":null,"port":"{{ with .Pod.serviceP2P.spec.ports }}{{ default (30303 \| int) (index . \"p2p-tcp\" \"nodePort\" \| int) }}{{ end }}","protocol":"UDP","targetPort":null}}}}` |
  | firehoseComponentDefaults.serviceP2P.metadata.annotations | Additional service annotations | object | `{}` |
  | firehoseComponentDefaults.serviceP2P.metadata.labels | Additional service labels | object | `{}` |