diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b139ff55fe..ce6681f871 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -17,3 +17,4 @@
 /charts/enterprise-logs/ @grafana/loki-squad
 /charts/tempo-vulture/ @grafana/tempo @Whyeasy @dgzlopes
 /charts/synthetic-monitoring-agent/ @torstenwalter @zanhsieh
+/charts/agent-operator/ @grafana/grafana-agent-maintainers
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 800c0a59b9..e46c9e748e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -47,14 +47,19 @@ jobs:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: "true"
 
+      - name: Login to GHCR
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Push charts to GHCR
         run: |
           shopt -s nullglob
-          for pkg in .cr-release-packages/*; do
+          for pkg in .cr-release-packages/*.tgz; do
             if [ -z "${pkg:-}" ]; then
               break
             fi
-            if ! helm push "${pkg}" "oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts"; then
-              echo '::warning:: helm push failed!'
-            fi
+            helm push "${pkg}" "oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/helm-charts"
           done
diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml
index 8382c1f231..883f675808 100644
--- a/.github/workflows/update-helm-repo.yaml
+++ b/.github/workflows/update-helm-repo.yaml
@@ -79,15 +79,15 @@ jobs:
 
             if [ $(git tag -l "${name}-${version}") ]; then
               echo "Tag ${tagname} already exists, skipping release"
-              echo "::set-output name=changed::false"
+              echo "changed=false" >> $GITHUB_OUTPUT
             else
               echo "Releasing ${changed}"
-              echo "::set-output name=changed::true"
-              echo "::set-output name=chartpath::${changed}"
+              echo "changed=true" >> $GITHUB_OUTPUT
+              echo "chartpath=${changed}" >> $GITHUB_OUTPUT
             fi
           else
             echo "No charts have changed, skipping release"
-            echo "::set-output name=changed::false"
+            echo "changed=false" >> $GITHUB_OUTPUT
           fi
 
   release:
@@ -166,14 +166,14 @@ jobs:
           description=$(yq ".description" < ${changed}/Chart.yaml)
           name=$(yq ".name" < ${changed}/Chart.yaml)
           version=$(yq ".version" < ${changed}/Chart.yaml)
-          echo "::set-output name=chartpath::${changed}"
-          echo "::set-output name=desc::${description}"
+          echo "chartpath=${changed}" >> $GITHUB_OUTPUT
+          echo "desc=${description}" >> $GITHUB_OUTPUT
           if [[ -n "${HELM_TAG_PREFIX}" ]]; then
-            echo "::set-output name=tagname::${HELM_TAG_PREFIX}-${name}-${version}"
+            echo "tagname=${HELM_TAG_PREFIX}-${name}-${version}" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=tagname::${name}-${version}"
+            echo "tagname=${name}-${version}" >> $GITHUB_OUTPUT
           fi
-          echo "::set-output name=packagename::${name}-${version}"
+          echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT
 
       - name: Install CR tool
         run: |
diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml
index 19bbce5cb8..7f83bf24b1 100644
--- a/charts/agent-operator/Chart.yaml
+++ b/charts/agent-operator/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 name: grafana-agent-operator
 description: A Helm chart for Grafana Agent Operator
 type: application
-version: 0.3.17
-appVersion: "0.40.1"
+version: 0.3.21
+appVersion: "0.40.4"
 home: https://grafana.com/docs/agent/v0.40/
-icon: https://raw.githubusercontent.com/grafana/agent/v0.40.0/docs/sources/assets/logo_and_name.png
+icon: https://raw.githubusercontent.com/grafana/agent/v0.40.4/docs/sources/assets/logo_and_name.png
 sources:
-  - https://github.com/grafana/agent/tree/v0.40.0/pkg/operator
+  - https://github.com/grafana/agent/tree/v0.40.4/pkg/operator
 maintainers:
   - name: Grafana Agent Team
     email: grafana-agent-team@googlegroups.com
diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md
index f9f3657974..693da6935e 100644
--- a/charts/agent-operator/README.md
+++ b/charts/agent-operator/README.md
@@ -1,6 +1,6 @@
 # grafana-agent-operator
 
-![Version: 0.3.17](https://img.shields.io/badge/Version-0.3.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.1](https://img.shields.io/badge/AppVersion-0.40.1-informational?style=flat-square)
+![Version: 0.3.21](https://img.shields.io/badge/Version-0.3.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square)
 
 A Helm chart for Grafana Agent Operator
 
@@ -8,7 +8,7 @@ A Helm chart for Grafana Agent Operator
 
 ## Source Code
 
-* <https://github.com/grafana/agent/tree/v0.40.0/pkg/operator>
+* <https://github.com/grafana/agent/tree/v0.40.4/pkg/operator>
 
 Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources.
 
@@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
 | image.pullSecrets | list | `[]` | Image pull secrets |
 | image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"grafana/agent-operator"` | Image repo |
-| image.tag | string | `"v0.40.1"` | Image tag |
+| image.tag | string | `"v0.40.4"` | Image tag |
 | kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets |
 | nameOverride | string | `""` | Overrides the chart's name |
 | nodeSelector | object | `{}` | nodeSelector configuration |
@@ -75,4 +75,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
 | resources | object | `{}` | Resource limits and requests config |
 | serviceAccount.create | bool | `true` | Toggle to create ServiceAccount |
 | serviceAccount.name | string | `nil` | Service account name |
+| test.image.registry | string | `"docker.io"` | Test image registry |
+| test.image.repository | string | `"library/busybox"` | Test image repo |
+| test.image.tag | string | `"latest"` | Test image tag |
 | tolerations | list | `[]` | Tolerations applied to Pods |
diff --git a/charts/agent-operator/templates/tests/test-grafanaagent.yaml b/charts/agent-operator/templates/tests/test-grafanaagent.yaml
index 9e9d9132de..4001da4e9e 100644
--- a/charts/agent-operator/templates/tests/test-grafanaagent.yaml
+++ b/charts/agent-operator/templates/tests/test-grafanaagent.yaml
@@ -107,12 +107,12 @@ metadata:
 spec:
   containers:
   - name: busybox
-    image: busybox
+    image: "{{ .Values.test.image.registry }}/{{ .Values.test.image.repository }}:{{ .Values.test.image.tag }}"
     command: ['wget']
     args:  ['grafana-agent-test-operated:8080/-/healthy']
   # Wait for GrafanaAgent CR
   initContainers:
   - name: sleep
-    image: busybox
+    image: "{{ .Values.test.image.registry }}/{{ .Values.test.image.repository }}:{{ .Values.test.image.tag }}"
     command: ['sleep', '60']
   restartPolicy: Never
diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml
index 3592169353..b1610a0321 100644
--- a/charts/agent-operator/values.yaml
+++ b/charts/agent-operator/values.yaml
@@ -37,12 +37,21 @@ image:
   # -- Image repo
   repository: grafana/agent-operator
   # -- Image tag
-  tag: v0.40.1
+  tag: v0.40.4
   # -- Image pull policy
   pullPolicy: IfNotPresent
   # -- Image pull secrets
   pullSecrets: []
 
+test:
+  image:
+    # -- Test image registry
+    registry: docker.io
+    # -- Test image repo
+    repository: library/busybox
+    # -- Test image tag
+    tag: latest
+
 # -- hostAliases to add
 hostAliases: []
 #  - ip: 1.2.3.4
diff --git a/charts/grafana-sampling/.helmignore b/charts/grafana-sampling/.helmignore
new file mode 100644
index 0000000000..0e8a0eb36f
--- /dev/null
+++ b/charts/grafana-sampling/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/grafana-sampling/Chart.lock b/charts/grafana-sampling/Chart.lock
new file mode 100644
index 0000000000..a54564640a
--- /dev/null
+++ b/charts/grafana-sampling/Chart.lock
@@ -0,0 +1,9 @@
+dependencies:
+- name: grafana-agent
+  repository: https://grafana.github.io/helm-charts
+  version: 0.36.0
+- name: grafana-agent
+  repository: https://grafana.github.io/helm-charts
+  version: 0.36.0
+digest: sha256:6d04a55dce2c09c4c250c6453e0d58f7280750bf04fce51027b4e235062413e5
+generated: "2024-03-11T15:41:30.921516-07:00"
diff --git a/charts/grafana-sampling/Chart.yaml b/charts/grafana-sampling/Chart.yaml
new file mode 100644
index 0000000000..a5b985588b
--- /dev/null
+++ b/charts/grafana-sampling/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v2
+name: grafana-sampling
+description: A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
+type: application
+version: 0.1.1
+appVersion: "v0.40.2"
+sources:
+  - https://github.com/grafana/agent
+  - https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/setup/sampling/tail/
+dependencies:
+  - name: grafana-agent
+    version: 0.36.0
+    repository: https://grafana.github.io/helm-charts
+    alias: grafana-agent-deployment
+  - name: grafana-agent
+    version: 0.36.0
+    repository: https://grafana.github.io/helm-charts
+    alias: grafana-agent-statefulset
diff --git a/charts/grafana-sampling/README.md b/charts/grafana-sampling/README.md
new file mode 100644
index 0000000000..0c10e0ec84
--- /dev/null
+++ b/charts/grafana-sampling/README.md
@@ -0,0 +1,124 @@
+# grafana-sampling
+
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.40.2](https://img.shields.io/badge/AppVersion-v0.40.2-informational?style=flat-square)
+
+A Helm chart for a layered OTLP tail sampling and metrics generation pipeline.
+
+This chart deploys the following architecture to your environment:
+![Photo of sampling architecture](./sampling-architecture.png)
+
+Note: by default, only OTLP traces are accepted at the load balancing layer.
+
+## Chart Repo
+
+Add the following repo to use the chart:
+
+```console
+helm repo add grafana https://grafana.github.io/helm-charts
+```
+## Installing the Chart
+
+Use the following command to install the chart with the release name `my-release`. Make sure to populate the required values.
+
+```console
+helm install my-release grafana/grafana-sampling --values - <<EOF | less
+grafana-agent-statefulset:
+  agent:
+    extraEnv:
+      - name: GRAFANA_CLOUD_API_KEY
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_URL
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_USERNAME
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_ENDPOINT
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_USERNAME
+        value: <REQUIRED>
+      # This is required for adaptive metric deduplication in Grafana Cloud
+      - name: POD_UID
+        valueFrom:
+          fieldRef:
+            apiVersion: v1
+            fieldPath: metadata.uid
+EOF
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the my-release deployment:
+
+```console
+helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Upgrading
+
+A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| grafana-agent-deployment.agent.configMap.create | bool | `false` |  |
+| grafana-agent-deployment.agent.extraPorts[0].name | string | `"otlp-grpc"` |  |
+| grafana-agent-deployment.agent.extraPorts[0].port | int | `4317` |  |
+| grafana-agent-deployment.agent.extraPorts[0].protocol | string | `"TCP"` |  |
+| grafana-agent-deployment.agent.extraPorts[0].targetPort | int | `4317` |  |
+| grafana-agent-deployment.agent.extraPorts[1].name | string | `"otlp-http"` |  |
+| grafana-agent-deployment.agent.extraPorts[1].port | int | `4318` |  |
+| grafana-agent-deployment.agent.extraPorts[1].protocol | string | `"TCP"` |  |
+| grafana-agent-deployment.agent.extraPorts[1].targetPort | int | `4318` |  |
+| grafana-agent-deployment.agent.resources.requests.cpu | string | `"1"` |  |
+| grafana-agent-deployment.agent.resources.requests.memory | string | `"2G"` |  |
+| grafana-agent-deployment.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. |
+| grafana-agent-deployment.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. |
+| grafana-agent-deployment.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. |
+| grafana-agent-deployment.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. |
+| grafana-agent-deployment.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. |
+| grafana-agent-deployment.controller.replicas | int | `1` |  |
+| grafana-agent-deployment.controller.type | string | `"deployment"` |  |
+| grafana-agent-deployment.nameOverride | string | `"deployment"` | Do not change this. |
+| grafana-agent-statefulset.agent.configMap.create | bool | `false` |  |
+| grafana-agent-statefulset.agent.extraEnv[0].name | string | `"GRAFANA_CLOUD_API_KEY"` |  |
+| grafana-agent-statefulset.agent.extraEnv[0].value | string | `"<REQUIRED>"` |  |
+| grafana-agent-statefulset.agent.extraEnv[1].name | string | `"GRAFANA_CLOUD_PROMETHEUS_URL"` |  |
+| grafana-agent-statefulset.agent.extraEnv[1].value | string | `"<REQUIRED>"` |  |
+| grafana-agent-statefulset.agent.extraEnv[2].name | string | `"GRAFANA_CLOUD_PROMETHEUS_USERNAME"` |  |
+| grafana-agent-statefulset.agent.extraEnv[2].value | string | `"<REQUIRED>"` |  |
+| grafana-agent-statefulset.agent.extraEnv[3].name | string | `"GRAFANA_CLOUD_TEMPO_ENDPOINT"` |  |
+| grafana-agent-statefulset.agent.extraEnv[3].value | string | `"<REQUIRED>"` |  |
+| grafana-agent-statefulset.agent.extraEnv[4].name | string | `"GRAFANA_CLOUD_TEMPO_USERNAME"` |  |
+| grafana-agent-statefulset.agent.extraEnv[4].value | string | `"<REQUIRED>"` |  |
+| grafana-agent-statefulset.agent.extraEnv[5].name | string | `"POD_UID"` |  |
+| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.apiVersion | string | `"v1"` |  |
+| grafana-agent-statefulset.agent.extraEnv[5].valueFrom.fieldRef.fieldPath | string | `"metadata.uid"` |  |
+| grafana-agent-statefulset.agent.extraPorts[0].name | string | `"otlp-grpc"` |  |
+| grafana-agent-statefulset.agent.extraPorts[0].port | int | `4317` |  |
+| grafana-agent-statefulset.agent.extraPorts[0].protocol | string | `"TCP"` |  |
+| grafana-agent-statefulset.agent.extraPorts[0].targetPort | int | `4317` |  |
+| grafana-agent-statefulset.agent.resources.requests.cpu | string | `"1"` |  |
+| grafana-agent-statefulset.agent.resources.requests.memory | string | `"2G"` |  |
+| grafana-agent-statefulset.controller.autoscaling.enabled | bool | `false` | Creates a HorizontalPodAutoscaler for controller type deployment. |
+| grafana-agent-statefulset.controller.autoscaling.maxReplicas | int | `5` | The upper limit for the number of replicas to which the autoscaler can scale up. |
+| grafana-agent-statefulset.controller.autoscaling.minReplicas | int | `2` | The lower limit for the number of replicas to which the autoscaler can scale down. |
+| grafana-agent-statefulset.controller.autoscaling.targetCPUUtilizationPercentage | int | `0` | Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling. |
+| grafana-agent-statefulset.controller.autoscaling.targetMemoryUtilizationPercentage | int | `80` | Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling. |
+| grafana-agent-statefulset.controller.replicas | int | `1` |  |
+| grafana-agent-statefulset.controller.type | string | `"statefulset"` |  |
+| grafana-agent-statefulset.nameOverride | string | `"statefulset"` | Do not change this. |
+| grafana-agent-statefulset.rbac.create | bool | `false` |  |
+| grafana-agent-statefulset.service.clusterIP | string | `"None"` |  |
+| grafana-agent-statefulset.serviceAccount.create | bool | `false` |  |
+| metricsGeneration.dimensions | list | `["service.namespace","service.version","deployment.environment","k8s.cluster.name"]` | Additional dimensions to add to generated metrics. |
+| metricsGeneration.enabled | bool | `true` | Toggle generation of spanmetrics and servicegraph metrics. |
+| sampling.decisionWait | string | `"15s"` | Wait time since the first span of a trace before making a sampling decision. |
+| sampling.enabled | bool | `true` | Toggle tail sampling. |
+| sampling.extraPolicies | string | A policy to sample long requests is added by default. | User-defined policies in river format. |
+| sampling.failedRequests.percentage | int | `50` | Percentage of failed requests to sample. |
+| sampling.failedRequests.sample | bool | `false` | Toggle sampling failed requests. |
+| sampling.successfulRequests.percentage | int | `10` | Percentage of successful requests to sample. |
+| sampling.successfulRequests.sample | bool | `true` | Toggle sampling successful requests. |
+
diff --git a/charts/grafana-sampling/README.md.gotmpl b/charts/grafana-sampling/README.md.gotmpl
new file mode 100644
index 0000000000..5cae818919
--- /dev/null
+++ b/charts/grafana-sampling/README.md.gotmpl
@@ -0,0 +1,63 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+This chart deploys the following architecture to your environment:
+![Photo of sampling architecture](./sampling-architecture.png)
+
+Note: by default, only OTLP traces are accepted at the load balancing layer.
+
+
+## Chart Repo
+
+Add the following repo to use the chart:
+
+```console
+helm repo add grafana https://grafana.github.io/helm-charts
+```
+## Installing the Chart
+
+Use the following command to install the chart with the release name `my-release`. Make sure to populate the required values.
+
+```console
+helm install my-release grafana/grafana-sampling --values - <<EOF | less
+grafana-agent-statefulset:
+  agent:
+    extraEnv:
+      - name: GRAFANA_CLOUD_API_KEY
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_URL
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_USERNAME
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_ENDPOINT
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_USERNAME
+        value: <REQUIRED>
+      # This is required for adaptive metric deduplication in Grafana Cloud
+      - name: POD_UID
+        valueFrom:
+          fieldRef:
+            apiVersion: v1
+            fieldPath: metadata.uid
+EOF
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the my-release deployment:
+
+```console
+helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Upgrading
+
+A major chart version change indicates that there is an incompatible breaking change needing manual actions.
+
+{{ template "chart.valuesSection" . }}
+
diff --git a/charts/grafana-sampling/sampling-architecture.png b/charts/grafana-sampling/sampling-architecture.png
new file mode 100644
index 0000000000..ebd068947d
Binary files /dev/null and b/charts/grafana-sampling/sampling-architecture.png differ
diff --git a/charts/grafana-sampling/templates/_agent_config_deployment.river.txt b/charts/grafana-sampling/templates/_agent_config_deployment.river.txt
new file mode 100644
index 0000000000..c78b8e702a
--- /dev/null
+++ b/charts/grafana-sampling/templates/_agent_config_deployment.river.txt
@@ -0,0 +1,5 @@
+{{- define "agent.config.deployment" -}}
+  {{- include "deployment.receiver.otlp" . }}
+  {{- include "deployment.processor.batch" . }}
+  {{- include "deployment.exporter.loadbalancing" . }}
+{{- end -}}
diff --git a/charts/grafana-sampling/templates/_agent_config_statefulset.river.txt b/charts/grafana-sampling/templates/_agent_config_statefulset.river.txt
new file mode 100644
index 0000000000..44e8b7f671
--- /dev/null
+++ b/charts/grafana-sampling/templates/_agent_config_statefulset.river.txt
@@ -0,0 +1,18 @@
+{{- define "agent.config.statefulset" -}}
+  {{- include "statefulset.receiver.otlp" . }}
+  {{- if .Values.metricsGeneration.enabled -}}
+    {{- include "statefulset.connector.spanmetrics" . }}
+    {{- include "statefulset.processor.transform.drop_unneeded_resource_attributes" . }}
+    {{- include "statefulset.processor.transform.use_grafana_metric_names" . }}
+    {{- include "statefulset.processor.filter" . }}
+    {{- include "statefulset.connector.servicegraph" . }}
+    {{- include "statefulset.exporter.prometheus" . }}
+    {{- include "statefulset.prometheus.remote_write" . }}
+  {{- end -}}
+  {{- if .Values.sampling.enabled -}}
+    {{- include "statefulset.processor.tail_sampling" . }}
+  {{- end -}}
+  {{- include "statefulset.processor.batch" . }}
+  {{- include "exporter.otlp" . }}
+  {{- include "auth.basic" . }}
+{{- end -}}
diff --git a/charts/grafana-sampling/templates/_helpers.tpl b/charts/grafana-sampling/templates/_helpers.tpl
new file mode 100644
index 0000000000..eabc133596
--- /dev/null
+++ b/charts/grafana-sampling/templates/_helpers.tpl
@@ -0,0 +1,9 @@
+{{/* use the release name as the serviceAccount name for deployment and statefulset agents */}}
+{{- define "grafana-agent.serviceAccountName" -}}
+{{- default .Release.Name }}
+{{- end }}
+
+{{/* Calculate name of image ID to use for "grafana-agent". */}}
+{{- define "grafana-agent.imageId" -}}
+{{- printf ":%s" .Chart.AppVersion }}
+{{- end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_auth_basic.river.txt b/charts/grafana-sampling/templates/_otelcol_auth_basic.river.txt
new file mode 100644
index 0000000000..2a34fe93ba
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_auth_basic.river.txt
@@ -0,0 +1,8 @@
+{{- define "auth.basic" -}}
+otelcol.auth.basic "grafana_cloud_tempo" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.auth.basic/
+  username = env("GRAFANA_CLOUD_TEMPO_USERNAME")
+  password = env("GRAFANA_CLOUD_API_KEY")
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.river.txt b/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.river.txt
new file mode 100644
index 0000000000..f3e97c52e3
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_connector_servicegraph.river.txt
@@ -0,0 +1,20 @@
+{{- define "statefulset.connector.servicegraph" -}}
+otelcol.connector.servicegraph "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.servicegraph/
+  dimensions = [
+    {{- range $.Values.metricsGeneration.dimensions }}
+    {{ . | quote }},
+    {{- end }}
+  ]
+  latency_histogram_buckets = ["0s", "0.005s", "0.01s", "0.025s", "0.05s", "0.075s", "0.1s", "0.25s", "0.5s", "0.75s", "1s", "2.5s", "5s", "7.5s", "10s"]
+
+  store {
+    ttl = "2s"
+  }
+
+  output {
+    metrics = [otelcol.processor.batch.default.input]
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.river.txt b/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.river.txt
new file mode 100644
index 0000000000..1c12d34c13
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_connector_spanmetrics.river.txt
@@ -0,0 +1,26 @@
+{{- define "statefulset.connector.spanmetrics" -}}
+otelcol.connector.spanmetrics "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.connector.spanmetrics/
+  {{- range $.Values.metricsGeneration.dimensions }}
+  dimension {
+    name = {{ . | quote }}
+  }
+  {{- end }}
+
+  namespace = "traces.spanmetrics"
+
+  histogram {
+    unit = "s"
+
+    explicit {
+      buckets = ["0s", "0.005s", "0.01s", "0.025s", "0.05s", "0.075s", "0.1s", "0.25s", "0.5s", "0.75s", "1s", "2.5s", "5s", "7.5s", "10s"]
+    }
+  }
+
+  output {
+    metrics = [otelcol.processor.filter.drop_unneeded_span_metrics.input]
+  }
+}
+
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt b/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt
new file mode 100644
index 0000000000..f2ec7ef43e
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_exporter_loadbalancing.river.txt
@@ -0,0 +1,22 @@
+{{- define "deployment.exporter.loadbalancing" -}}
+otelcol.exporter.loadbalancing "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.loadbalancing/
+  resolver {
+
+    kubernetes {
+      service = "{{ .Release.Name }}-statefulset.{{ .Release.Namespace }}"
+    }
+  }
+
+  protocol {
+    otlp {
+      client {
+        tls {
+          insecure = true
+        }
+      }
+    }
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_exporter_otlp.river.txt b/charts/grafana-sampling/templates/_otelcol_exporter_otlp.river.txt
new file mode 100644
index 0000000000..6b1c68285a
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_exporter_otlp.river.txt
@@ -0,0 +1,10 @@
+{{- define "exporter.otlp" -}}
+otelcol.exporter.otlp "grafana_cloud_tempo" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.otlp/
+  client {
+    endpoint = env("GRAFANA_CLOUD_TEMPO_ENDPOINT")
+    auth     = otelcol.auth.basic.grafana_cloud_tempo.handler
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_exporter_prometheus.river.txt b/charts/grafana-sampling/templates/_otelcol_exporter_prometheus.river.txt
new file mode 100644
index 0000000000..9813580b4e
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_exporter_prometheus.river.txt
@@ -0,0 +1,8 @@
+{{- define "statefulset.exporter.prometheus" -}}
+otelcol.exporter.prometheus "grafana_cloud_prometheus" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.exporter.prometheus/
+  add_metric_suffixes = false
+  forward_to          = [prometheus.remote_write.grafana_cloud_prometheus.receiver]
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt b/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt
new file mode 100644
index 0000000000..25fb2ef497
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_processor_batch.river.txt
@@ -0,0 +1,22 @@
+{{- define "deployment.processor.batch" -}}
+otelcol.processor.batch "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.batch/
+  output {
+    traces = [otelcol.exporter.loadbalancing.default.input]
+  }
+}
+
+{{ end }}
+
+{{- define "statefulset.processor.batch" -}}
+otelcol.processor.batch "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.batch/
+  output {
+    {{ if .Values.metricsGeneration.enabled }}
+    metrics = [otelcol.exporter.prometheus.grafana_cloud_prometheus.input]
+    {{ end }}
+    traces  = [otelcol.exporter.otlp.grafana_cloud_tempo.input]
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_processor_filter.river.txt b/charts/grafana-sampling/templates/_otelcol_processor_filter.river.txt
new file mode 100644
index 0000000000..b02087ef7b
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_processor_filter.river.txt
@@ -0,0 +1,17 @@
+{{- define "statefulset.processor.filter" -}}
+otelcol.processor.filter "drop_unneeded_span_metrics" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.filter/
+  error_mode = "ignore"
+
+  metrics {
+    datapoint = [
+      "IsMatch(metric.name, \"traces.spanmetrics.calls|traces.spanmetrics.duration\") and IsMatch(attributes[\"span.kind\"], \"SPAN_KIND_INTERNAL|SPAN_KIND_CLIENT|SPAN_KIND_PRODUCER\")",
+    ]
+  }
+
+  output {
+    metrics = [otelcol.processor.transform.use_grafana_metric_names.input]
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_processor_tail_sampling.river.txt b/charts/grafana-sampling/templates/_otelcol_processor_tail_sampling.river.txt
new file mode 100644
index 0000000000..0e752a8089
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_processor_tail_sampling.river.txt
@@ -0,0 +1,60 @@
+{{- define "statefulset.processor.tail_sampling" -}}
+otelcol.processor.tail_sampling "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.tail_sampling/
+
+  decision_wait = {{ .Values.sampling.decisionWait | quote  }}
+
+{{ if .Values.sampling.successfulRequests.sample }}
+    policy {
+      name = "sample-successful-requests"
+      type = "and"
+      and {
+        and_sub_policy {
+          name = "status-code-policy"
+          type = "status_code"
+          status_code {
+            status_codes = ["OK", "UNSET"]
+          }
+        }
+        and_sub_policy {
+          name = "probabilistic-policy"
+          type = "probabilistic"
+          probabilistic {
+            sampling_percentage = {{ .Values.sampling.successfulRequests.percentage }}
+          }
+        }
+      }
+    }
+{{ end }}
+
+{{ if .Values.sampling.failedRequests.sample }}
+    policy {
+      name = "sample-failed-requests"
+      type = "and"
+      and {
+        and_sub_policy {
+          name = "status-code-policy"
+          type = "status_code"
+          status_code {
+            status_codes = ["ERROR"]
+          }
+        }
+        and_sub_policy {
+          name = "probabilistic-policy"
+          type = "probabilistic"
+          probabilistic {
+            sampling_percentage = {{ .Values.sampling.failedRequests.percentage }}
+          }
+        }
+      }
+    }
+{{ end }}
+
+{{ .Values.sampling.extraPolicies | indent 2 }}
+
+  output {
+    traces = [otelcol.processor.batch.default.input]
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_otelcol_processor_transform.river.txt b/charts/grafana-sampling/templates/_otelcol_processor_transform.river.txt
new file mode 100644
index 0000000000..7963a325aa
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_processor_transform.river.txt
@@ -0,0 +1,46 @@
+{{- define "statefulset.processor.transform.use_grafana_metric_names" -}}
+otelcol.processor.transform "use_grafana_metric_names" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.transform/
+  error_mode = "ignore"
+
+  metric_statements {
+    context    = "metric"
+    statements = [
+      "set(name, \"traces.spanmetrics.latency\") where name == \"traces.spanmetrics.duration\"",
+      "set(name, \"traces.spanmetrics.calls.total\") where name == \"traces.spanmetrics.calls\"",
+    ]
+  }
+
+  output {
+    metrics = [otelcol.processor.batch.default.input]
+  }
+}
+
+{{ end }}
+
+{{- define "statefulset.processor.transform.drop_unneeded_resource_attributes"}}
+otelcol.processor.transform "drop_unneeded_resource_attributes" {
+    // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.processor.transform/
+    error_mode = "ignore"
+
+    trace_statements {
+        context = "resource"
+        statements = [
+            "delete_key(attributes, \"k8s.pod.start_time\")",
+            "delete_key(attributes, \"os.description\")",
+            "delete_key(attributes, \"os.type\")",
+            "delete_key(attributes, \"process.command_args\")",
+            "delete_key(attributes, \"process.executable.path\")",
+            "delete_key(attributes, \"process.pid\")",
+            "delete_key(attributes, \"process.runtime.description\")",
+            "delete_key(attributes, \"process.runtime.name\")",
+            "delete_key(attributes, \"process.runtime.version\")",
+        ]
+    }
+
+    output {
+        traces = [otelcol.connector.spanmetrics.default.input]
+    }
+}
+
+{{ end  }}
diff --git a/charts/grafana-sampling/templates/_otelcol_receiver_otlp.river.txt b/charts/grafana-sampling/templates/_otelcol_receiver_otlp.river.txt
new file mode 100644
index 0000000000..386a604a5a
--- /dev/null
+++ b/charts/grafana-sampling/templates/_otelcol_receiver_otlp.river.txt
@@ -0,0 +1,39 @@
+{{- define "deployment.receiver.otlp" -}}
+otelcol.receiver.otlp "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.otlp/
+
+  // configures the default grpc endpoint "0.0.0.0:4317"
+  grpc { }
+  // configures the default http/protobuf endpoint "0.0.0.0:4318"
+  http { }
+
+  output {
+    traces = [otelcol.processor.batch.default.input]
+  }
+}
+
+{{ end }}
+
+{{- define "statefulset.receiver.otlp" -}}
+otelcol.receiver.otlp "default" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/otelcol.receiver.otlp/
+
+  // configures the default grpc endpoint "0.0.0.0:4317"
+  grpc { }
+
+  output {
+    traces = [
+      {{ if .Values.sampling.enabled }}
+      otelcol.processor.tail_sampling.default.input,
+      {{ else }}
+      otelcol.processor.batch.default.input,
+      {{ end }}
+      {{ if .Values.metricsGeneration.enabled }}
+      otelcol.connector.servicegraph.default.input,
+      otelcol.processor.transform.drop_unneeded_resource_attributes.input,
+      {{ end }}
+    ]
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/_prometheus_remote_write.river.txt b/charts/grafana-sampling/templates/_prometheus_remote_write.river.txt
new file mode 100644
index 0000000000..1ddee68f17
--- /dev/null
+++ b/charts/grafana-sampling/templates/_prometheus_remote_write.river.txt
@@ -0,0 +1,20 @@
+{{- define "statefulset.prometheus.remote_write" -}}
+prometheus.remote_write "grafana_cloud_prometheus" {
+  // https://grafana.com/docs/agent/latest/flow/reference/components/prometheus.remote_write/
+  endpoint {
+    url = env("GRAFANA_CLOUD_PROMETHEUS_URL")
+
+    basic_auth {
+      username = env("GRAFANA_CLOUD_PROMETHEUS_USERNAME")
+      password = env("GRAFANA_CLOUD_API_KEY")
+    }
+    queue_config {
+      retry_on_http_429 = false
+    }
+  }
+  external_labels = {
+    "__metrics_gen_instance" = env("POD_UID"),
+  }
+}
+
+{{ end }}
diff --git a/charts/grafana-sampling/templates/configmap_deployment.yaml b/charts/grafana-sampling/templates/configmap_deployment.yaml
new file mode 100644
index 0000000000..0255b35e12
--- /dev/null
+++ b/charts/grafana-sampling/templates/configmap_deployment.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-deployment
+  labels:
+    {{- include "grafana-agent.labels" . | nindent 4 }}
+data:
+  config.river: |- {{- (include "agent.config.deployment" .) | nindent 4 }}
diff --git a/charts/grafana-sampling/templates/configmap_statefulset.yaml b/charts/grafana-sampling/templates/configmap_statefulset.yaml
new file mode 100644
index 0000000000..2a0a5499f1
--- /dev/null
+++ b/charts/grafana-sampling/templates/configmap_statefulset.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-statefulset
+  labels:
+    {{- include "grafana-agent.labels" . | nindent 4 }}
+data:
+   config.river: |- {{- (include "agent.config.statefulset" .) | nindent 4 }}
diff --git a/charts/grafana-sampling/values.yaml b/charts/grafana-sampling/values.yaml
new file mode 100644
index 0000000000..71b9ab18c6
--- /dev/null
+++ b/charts/grafana-sampling/values.yaml
@@ -0,0 +1,140 @@
+metricsGeneration:
+  # -- Toggle generation of spanmetrics and servicegraph metrics.
+  enabled: true
+  # -- Additional dimensions to add to generated metrics.
+  dimensions:
+    - service.namespace
+    - service.version
+    - deployment.environment
+    - k8s.cluster.name
+
+sampling:
+  # -- Toggle tail sampling.
+  enabled: true
+  # -- Wait time since the first span of a trace before making a sampling decision.
+  decisionWait: 15s
+  successfulRequests:
+    # -- Toggle sampling successful requests.
+    sample: true
+    # -- Percentage of successful requests to sample.
+    percentage: 10
+  failedRequests:
+    # -- Toggle sampling failed requests.
+    sample: false
+    # -- Percentage of failed requests to sample.
+    percentage: 50
+  # -- User-defined policies in river format.
+  # @default -- A policy to sample long requests is added by default.
+  extraPolicies: |-
+    policy {
+      name = "sample-long-requests"
+      type = "and"
+      and {
+        and_sub_policy {
+          name = "latency"
+          type = "latency"
+          latency {
+            threshold_ms = 5000
+          }
+        }
+        and_sub_policy {
+         name = "probabilistic-policy"
+         type = "probabilistic"
+          probabilistic {
+           sampling_percentage = 50
+          }
+        }
+      }
+    }
+
+# @ignored Ignore agent deployment
+grafana-agent-deployment:
+  # -- Do not change this.
+  nameOverride: deployment
+  controller:
+    type: deployment
+    replicas: 1
+    autoscaling:
+      # -- Creates a HorizontalPodAutoscaler for controller type deployment.
+      enabled: false
+      # -- The lower limit for the number of replicas to which the autoscaler can scale down.
+      minReplicas: 2
+      # -- The upper limit for the number of replicas to which the autoscaler can scale up.
+      maxReplicas: 5
+      # -- Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling.
+      targetCPUUtilizationPercentage: 0
+      # -- Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling.
+      targetMemoryUtilizationPercentage: 80
+  agent:
+    # This chart creates the configmaps
+    configMap:
+      create: false
+    resources:
+      requests:
+        cpu: "1"
+        memory: "2G"
+    extraPorts:
+      - name: otlp-grpc
+        port: 4317
+        targetPort: 4317
+        protocol: TCP
+      - name: otlp-http
+        port: 4318
+        targetPort: 4318
+        protocol: TCP
+
+# @ignored Ignore agent statefulset
+grafana-agent-statefulset:
+  # -- Do not change this.
+  nameOverride: statefulset
+  controller:
+    type: statefulset
+    replicas: 1
+    autoscaling:
+      # -- Creates a HorizontalPodAutoscaler for controller type deployment.
+      enabled: false
+      # -- The lower limit for the number of replicas to which the autoscaler can scale down.
+      minReplicas: 2
+      # -- The upper limit for the number of replicas to which the autoscaler can scale up.
+      maxReplicas: 5
+      # -- Average CPU utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetCPUUtilizationPercentage` to 0 will disable CPU scaling.
+      targetCPUUtilizationPercentage: 0
+      # -- Average Memory utilization across all relevant pods, a percentage of the requested value of the resource for the pods. Setting `targetMemoryUtilizationPercentage` to 0 will disable Memory scaling.
+      targetMemoryUtilizationPercentage: 80
+  service:
+    clusterIP: None
+  agent:
+    extraEnv:
+      - name: GRAFANA_CLOUD_API_KEY
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_URL
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_PROMETHEUS_USERNAME
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_ENDPOINT
+        value: <REQUIRED>
+      - name: GRAFANA_CLOUD_TEMPO_USERNAME
+        value: <REQUIRED>
+      # This is required for adaptive metric deduplication in Grafana Cloud
+      - name: POD_UID
+        valueFrom:
+          fieldRef:
+            apiVersion: v1
+            fieldPath: metadata.uid
+    # This chart creates the configmaps
+    configMap:
+      create: false
+    resources:
+      requests:
+        cpu: "1"
+        memory: "2G"
+    extraPorts:
+      - name: otlp-grpc
+        port: 4317
+        targetPort: 4317
+        protocol: TCP
+  # The statefulset and deployment can share the same serviceAccount and rbac roles
+  serviceAccount:
+    create: false
+  rbac:
+    create: false
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
index 58b806fd97..efd3bd081c 100644
--- a/charts/grafana/Chart.yaml
+++ b/charts/grafana/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 7.3.3
-appVersion: 10.3.3
+version: 7.3.9
+appVersion: 10.4.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com
diff --git a/charts/grafana/README.md b/charts/grafana/README.md
index 6f645c564a..0ff07f297d 100644
--- a/charts/grafana/README.md
+++ b/charts/grafana/README.md
@@ -137,6 +137,7 @@ need to instead set `global.imageRegistry`.
 | `extraSecretMounts`                       | Additional grafana server secret mounts       | `[]`                                                    |
 | `extraVolumeMounts`                       | Additional grafana server volume mounts       | `[]`                                                    |
 | `extraVolumes`                            | Additional Grafana server volumes             | `[]`                                                    |
+| `automountServiceAccountToken`            | Mounted the service account token on the grafana pod. Mandatory, if sidecars are enabled  | `true`      |
 | `createConfigmap`                         | Enable creating the grafana configmap         | `true`                                                  |
 | `extraConfigmapMounts`                    | Additional grafana server configMap volume mounts (values are templated) | `[]`                         |
 | `extraEmptyDirMounts`                     | Additional grafana server emptyDir volume mounts | `[]`                                                 |
@@ -161,7 +162,7 @@ need to instead set `global.imageRegistry`.
 | `lifecycleHooks`                          | Lifecycle hooks for podStart and preStop [Example](https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/#define-poststart-and-prestop-handlers)     | `{}`                                                    |
 | `sidecar.image.registry`                  | Sidecar image registry                        | `quay.io`                          |
 | `sidecar.image.repository`                | Sidecar image repository                      | `kiwigrid/k8s-sidecar`                          |
-| `sidecar.image.tag`                       | Sidecar image tag                             | `1.24.6`                                                |
+| `sidecar.image.tag`                       | Sidecar image tag                             | `1.26.0`                                                |
 | `sidecar.image.sha`                       | Sidecar image sha (optional)                  | `""`                                                    |
 | `sidecar.imagePullPolicy`                 | Sidecar image pull policy                     | `IfNotPresent`                                          |
 | `sidecar.resources`                       | Sidecar resources                             | `{}`                                                    |
@@ -223,7 +224,7 @@ need to instead set `global.imageRegistry`.
 | `admin.existingSecret`                    | The name of an existing secret containing the admin credentials (can be templated). | `""`                                 |
 | `admin.userKey`                           | The key in the existing admin secret containing the username. | `"admin-user"`                          |
 | `admin.passwordKey`                       | The key in the existing admin secret containing the password. | `"admin-password"`                      |
-| `serviceAccount.autoMount`                | Automount the service account token in the pod| `true`                                                  |
+| `serviceAccount.automountServiceAccountToken` | Automount the service account token on all pods where is service account is used | `false` |
 | `serviceAccount.annotations`              | ServiceAccount annotations                    |                                                         |
 | `serviceAccount.create`                   | Create service account                        | `true`                                                  |
 | `serviceAccount.labels`                   | ServiceAccount labels                         | `{}`                                                    |
diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml
index eb8f87f077..c0edad2c46 100644
--- a/charts/grafana/templates/pvc.yaml
+++ b/charts/grafana/templates/pvc.yaml
@@ -25,6 +25,9 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.size | quote }}
+  {{- if (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }}
+  volumeName: {{ (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)).spec.volumeName }}
+  {{- end }}
   {{- with .Values.persistence.storageClassName }}
   storageClassName: {{ . }}
   {{- end }}
diff --git a/charts/grafana/templates/serviceaccount.yaml b/charts/grafana/templates/serviceaccount.yaml
index 784e71ba67..ffca0717ae 100644
--- a/charts/grafana/templates/serviceaccount.yaml
+++ b/charts/grafana/templates/serviceaccount.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.serviceAccount.create }}
-{{- $root := . -}}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.serviceAccount.autoMount | default .Values.serviceAccount.automountServiceAccountToken }}
 metadata:
   labels:
     {{- include "grafana.labels" . | nindent 4 }}
@@ -10,7 +10,7 @@ metadata:
     {{- end }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
-    {{- tpl (toYaml . | nindent 4) $root }}
+    {{- tpl (toYaml . | nindent 4) $ }}
   {{- end }}
   name: {{ include "grafana.serviceAccountName" . }}
   namespace: {{ include "grafana.namespace" . }}
diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
index 520e10991b..81fcda59a0 100644
--- a/charts/grafana/values.yaml
+++ b/charts/grafana/values.yaml
@@ -38,10 +38,13 @@ serviceAccount:
   nameTest:
   ## ServiceAccount labels.
   labels: {}
-## Service account annotations. Can be templated.
-#  annotations:
-#    eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here
-  autoMount: false
+  ## Service account annotations. Can be templated.
+  #  annotations:
+  #    eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here
+
+  ## autoMount is deprecated in favor of automountServiceAccountToken
+  # autoMount: false
+  automountServiceAccountToken: false
 
 replicas: 1
 
@@ -836,7 +839,7 @@ sidecar:
     # -- The Docker registry
     registry: quay.io
     repository: kiwigrid/k8s-sidecar
-    tag: 1.25.2
+    tag: 1.26.1
     sha: ""
   imagePullPolicy: IfNotPresent
   resources: {}
diff --git a/charts/k8s-monitoring/README.md b/charts/k8s-monitoring/README.md
new file mode 100644
index 0000000000..cb8bfad19c
--- /dev/null
+++ b/charts/k8s-monitoring/README.md
@@ -0,0 +1,8 @@
+# Kubernetes Monitoring chart
+
+The source for the Kubernetes Monitoring Helm chart can be found at
+<https://github.com/grafana/k8s-monitoring-helm>.
+Releases of the chart are still published to the <https://grafana.github.io/helm-charts>
+repository.
+
+If you have any issues with this chart, please file them on the [Kubernetes Monitoring Helm chart](https://github.com/grafana/k8s-monitoring-helm) repository.
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
index cbc06ce54e..e1f63554c1 100644
--- a/charts/loki-distributed/Chart.yaml
+++ b/charts/loki-distributed/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
-appVersion: 2.9.4
-version: 0.78.4
+appVersion: 2.9.6
+version: 0.79.1
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki
diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
index f737dfcb1b..644423c09a 100644
--- a/charts/loki-distributed/README.md
+++ b/charts/loki-distributed/README.md
@@ -1,6 +1,6 @@
 # loki-distributed
 
-![Version: 0.78.4](https://img.shields.io/badge/Version-0.78.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.4](https://img.shields.io/badge/AppVersion-2.9.4-informational?style=flat-square)
+![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 
@@ -24,6 +24,9 @@ helm repo add grafana https://grafana.github.io/helm-charts
 
 Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions.
 
+### From 0.78.x to 0.79.0
+Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary.
+
 ### From 0.74.x to 0.75.0
 The Index Gateway and Query Scheduler now expose the memberlist port 7946. In order to join the
 member list, you need to specify this in the `structuredConfig`:
diff --git a/charts/loki-distributed/README.md.gotmpl b/charts/loki-distributed/README.md.gotmpl
index 4c1967c807..23153d19b2 100644
--- a/charts/loki-distributed/README.md.gotmpl
+++ b/charts/loki-distributed/README.md.gotmpl
@@ -22,6 +22,9 @@ helm repo add grafana https://grafana.github.io/helm-charts
 
 Major version upgrades listed here indicate that there is an incompatible breaking change needing manual actions.
 
+### From 0.78.x to 0.79.0
+Removed the hardcoded, deprecated `boltdb.shipper.compactor.working-directory` flag in the Compactor Deployment template, so that it can be set with `.Values.compactor.extraArgs` and the `compactor.working-directory` flag if necessary.
+
 ### From 0.74.x to 0.75.0
 The Index Gateway and Query Scheduler now expose the memberlist port 7946. In order to join the
 member list, you need to specify this in the `structuredConfig`:
diff --git a/charts/loki-distributed/templates/compactor/deployment-compactor.yaml b/charts/loki-distributed/templates/compactor/deployment-compactor.yaml
index f6b440931c..80601c7725 100644
--- a/charts/loki-distributed/templates/compactor/deployment-compactor.yaml
+++ b/charts/loki-distributed/templates/compactor/deployment-compactor.yaml
@@ -67,7 +67,6 @@ spec:
           args:
             - -config.file=/etc/loki/config/config.yaml
             - -target=compactor
-            - -boltdb.shipper.compactor.working-directory=/var/loki/compactor
             {{- with .Values.compactor.extraArgs }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
index 12413c2463..243b03c86e 100644
--- a/charts/loki-distributed/values.yaml
+++ b/charts/loki-distributed/values.yaml
@@ -212,6 +212,7 @@ loki:
 
     compactor:
       shared_store: filesystem
+      working_directory: /var/loki/compactor
 
     ruler:
       storage:
diff --git a/charts/loki-stack/Chart.yaml b/charts/loki-stack/Chart.yaml
index 1242feb0c7..9d66f01143 100644
--- a/charts/loki-stack/Chart.yaml
+++ b/charts/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 2.10.1
+version: 2.10.2
 appVersion: v2.9.3
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."
diff --git a/charts/loki-stack/values.yaml b/charts/loki-stack/values.yaml
index 59c1e300b5..83ed6f016c 100644
--- a/charts/loki-stack/values.yaml
+++ b/charts/loki-stack/values.yaml
@@ -42,7 +42,7 @@ grafana:
       enabled: true
       maxLines: 1000
   image:
-    tag: 8.3.5
+    tag: 10.3.3
 
 prometheus:
   enabled: false
diff --git a/charts/rollout-operator/Chart.yaml b/charts/rollout-operator/Chart.yaml
index acff27d8ad..817940e6e3 100644
--- a/charts/rollout-operator/Chart.yaml
+++ b/charts/rollout-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.14.0
-appVersion: v0.13.0
+version: 0.15.0
+appVersion: v0.14.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0
diff --git a/charts/rollout-operator/README.md b/charts/rollout-operator/README.md
index f0de8efaa4..360e462007 100644
--- a/charts/rollout-operator/README.md
+++ b/charts/rollout-operator/README.md
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0](https://img.shields.io/badge/AppVersion-v0.13.0-informational?style=flat-square)
+![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)
 
 Grafana rollout-operator
 
diff --git a/charts/tempo-distributed/Chart.yaml b/charts/tempo-distributed/Chart.yaml
index 5f9ec77378..4cd2f6cd74 100644
--- a/charts/tempo-distributed/Chart.yaml
+++ b/charts/tempo-distributed/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: tempo-distributed
 description: Grafana Tempo in MicroService mode
 type: application
-version: 1.8.5
-appVersion: 2.3.1
+version: 1.9.9
+appVersion: 2.4.1
 engine: gotpl
 home: https://grafana.com/docs/tempo/latest/
 icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png
diff --git a/charts/tempo-distributed/README.md b/charts/tempo-distributed/README.md
index de831de8bb..7e3f743496 100644
--- a/charts/tempo-distributed/README.md
+++ b/charts/tempo-distributed/README.md
@@ -1,6 +1,6 @@
 # tempo-distributed
 
-![Version: 1.8.5](https://img.shields.io/badge/Version-1.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 1.9.9](https://img.shields.io/badge/Version-1.9.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
 
 Grafana Tempo in MicroService mode
 
@@ -223,6 +223,10 @@ The memcached default args are removed and should be provided manually. The sett
 | adminApi.extraVolumeMounts | list | `[]` |  |
 | adminApi.extraVolumes | list | `[]` |  |
 | adminApi.hostAliases | list | `[]` | hostAliases to add |
+| adminApi.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| adminApi.image.registry | string | `nil` | The Docker registry for the adminApi image. Overrides `tempo.image.registry` |
+| adminApi.image.repository | string | `nil` | Docker image repository for the adminApi image. Overrides `tempo.image.repository` |
+| adminApi.image.tag | string | `nil` | Docker image tag for the adminApi image. Overrides `tempo.image.tag` |
 | adminApi.initContainers | list | `[]` |  |
 | adminApi.nodeSelector | object | `{}` |  |
 | adminApi.persistence.subPath | string | `nil` |  |
@@ -244,6 +248,13 @@ The memcached default args are removed and should be provided manually. The sett
 | adminApi.terminationGracePeriodSeconds | int | `60` |  |
 | adminApi.tolerations | list | `[]` |  |
 | adminApi.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for admin-api pods. Passed through `tpl` and, thus, to be configured as string |
+| cache.caches[0].memcached.consistent_hash | bool | `true` |  |
+| cache.caches[0].memcached.host | string | `"{{ include \"tempo.fullname\" . }}-memcached"` |  |
+| cache.caches[0].memcached.service | string | `"memcached-client"` |  |
+| cache.caches[0].memcached.timeout | string | `"500ms"` |  |
+| cache.caches[0].roles[0] | string | `"parquet-footer"` |  |
+| cache.caches[0].roles[1] | string | `"bloom"` |  |
+| cache.caches[0].roles[2] | string | `"frontend-search"` |  |
 | compactor.config.compaction.block_retention | string | `"48h"` | Duration to keep blocks |
 | compactor.config.compaction.compacted_block_retention | string | `"1h"` |  |
 | compactor.config.compaction.compaction_cycle | string | `"30s"` | The time between compaction cycles |
@@ -319,7 +330,7 @@ The memcached default args are removed and should be provided manually. The sett
 | distributor.topologySpreadConstraints | string | Defaults to allow skew no more then 1 node per AZ | topologySpread for distributor pods. Passed through `tpl` and, thus, to be configured as string |
 | enterprise.enabled | bool | `false` |  |
 | enterprise.image.repository | string | `"grafana/enterprise-traces"` | Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository' |
-| enterprise.image.tag | string | `"v2.3.2"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
+| enterprise.image.tag | string | `"v2.4.0"` | Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag' |
 | enterpriseFederationFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for federation-frontend pods. Passed through `tpl` and, thus, to be configured as string |
 | enterpriseFederationFrontend.autoscaling.enabled | bool | `false` | Enable autoscaling for the federation-frontend |
 | enterpriseFederationFrontend.autoscaling.maxReplicas | int | `3` | Maximum autoscaling replicas for the federation-frontend |
@@ -362,6 +373,10 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.extraVolumeMounts | list | `[]` |  |
 | enterpriseGateway.extraVolumes | list | `[]` |  |
 | enterpriseGateway.hostAliases | list | `[]` | hostAliases to add |
+| enterpriseGateway.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| enterpriseGateway.image.registry | string | `nil` | The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry` |
+| enterpriseGateway.image.repository | string | `nil` | Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository` |
+| enterpriseGateway.image.tag | string | `nil` | Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag` |
 | enterpriseGateway.ingress.annotations | object | `{}` | Annotations for the gateway ingress |
 | enterpriseGateway.ingress.enabled | bool | `false` | Specifies whether an ingress for the gateway should be created |
 | enterpriseGateway.ingress.hosts | list | `[{"host":"gateway.gem.example.com","paths":[{"path":"/"}]}]` | Hosts configuration for the gateway ingress |
@@ -380,9 +395,12 @@ The memcached default args are removed and should be provided manually. The sett
 | enterpriseGateway.resources.requests.cpu | string | `"10m"` |  |
 | enterpriseGateway.resources.requests.memory | string | `"32Mi"` |  |
 | enterpriseGateway.securityContext | object | `{}` |  |
-| enterpriseGateway.service.annotations | object | `{}` |  |
-| enterpriseGateway.service.labels | object | `{}` |  |
-| enterpriseGateway.service.port | string | `nil` | If the port is left undefined, the service will listen on the same port as the pod |
+| enterpriseGateway.service.annotations | object | `{}` | Annotations for the enterprise gateway service |
+| enterpriseGateway.service.clusterIP | string | `nil` | ClusterIP of the enterprise gateway service |
+| enterpriseGateway.service.labels | object | `{}` | Labels for enterprise gateway service |
+| enterpriseGateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer for enterprise gateway service |
+| enterpriseGateway.service.port | string | `nil` | Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod |
+| enterpriseGateway.service.type | string | `"ClusterIP"` | Type of the enterprise gateway service |
 | enterpriseGateway.strategy.rollingUpdate.maxSurge | int | `0` |  |
 | enterpriseGateway.strategy.rollingUpdate.maxUnavailable | int | `1` |  |
 | enterpriseGateway.strategy.type | string | `"RollingUpdate"` |  |
@@ -484,6 +502,7 @@ The memcached default args are removed and should be provided manually. The sett
 | ingester.image.registry | string | `nil` | The Docker registry for the ingester image. Overrides `tempo.image.registry` |
 | ingester.image.repository | string | `nil` | Docker image repository for the ingester image. Overrides `tempo.image.repository` |
 | ingester.image.tag | string | `nil` | Docker image tag for the ingester image. Overrides `tempo.image.tag` |
+| ingester.initContainers | list | `[]` |  |
 | ingester.nodeSelector | object | `{}` | Node selector for ingester pods |
 | ingester.persistence.annotations | object | `{}` | Annotations for ingester's persist volume claim |
 | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper |
@@ -581,6 +600,7 @@ The memcached default args are removed and should be provided manually. The sett
 | metricsGenerator.image.registry | string | `nil` | The Docker registry for the metrics-generator image. Overrides `tempo.image.registry` |
 | metricsGenerator.image.repository | string | `nil` | Docker image repository for the metrics-generator image. Overrides `tempo.image.repository` |
 | metricsGenerator.image.tag | string | `nil` | Docker image tag for the metrics-generator image. Overrides `tempo.image.tag` |
+| metricsGenerator.initContainers | list | `[]` |  |
 | metricsGenerator.kind | string | `"Deployment"` | Kind of deployment [StatefulSet/Deployment] |
 | metricsGenerator.nodeSelector | object | `{}` | Node selector for metrics-generator pods |
 | metricsGenerator.persistence | object | `{"annotations":{},"enabled":false,"size":"10Gi","storageClass":null}` | Persistence configuration for metrics-generator |
@@ -765,6 +785,10 @@ The memcached default args are removed and should be provided manually. The sett
 | tokengenJob.extraArgs | object | `{}` |  |
 | tokengenJob.extraEnvFrom | list | `[]` |  |
 | tokengenJob.hostAliases | list | `[]` | hostAliases to add |
+| tokengenJob.image.pullSecrets | list | `[]` | Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets` |
+| tokengenJob.image.registry | string | `nil` | The Docker registry for the tokengenJob image. Overrides `tempo.image.registry` |
+| tokengenJob.image.repository | string | `nil` | Docker image repository for the tokengenJob image. Overrides `tempo.image.repository` |
+| tokengenJob.image.tag | string | `nil` | Docker image tag for the tokengenJob image. Overrides `tempo.image.tag` |
 | tokengenJob.initContainers | list | `[]` |  |
 | traces.jaeger.grpc.enabled | bool | `false` | Enable Tempo to ingest Jaeger GRPC traces |
 | traces.jaeger.grpc.receiverConfig | object | `{}` | Jaeger GRPC receiver config |
@@ -900,7 +924,7 @@ config: |
       backend: s3
       s3:
         access_key: tempo
-        bucket: tempo
+        bucket: <your s3 bucket>
         endpoint: minio:9000
         insecure: true
         secret_key: supersecret
diff --git a/charts/tempo-distributed/README.md.gotmpl b/charts/tempo-distributed/README.md.gotmpl
index 72219e0359..446c654362 100644
--- a/charts/tempo-distributed/README.md.gotmpl
+++ b/charts/tempo-distributed/README.md.gotmpl
@@ -323,7 +323,7 @@ config: |
       backend: s3
       s3:
         access_key: tempo
-        bucket: tempo
+        bucket: <your s3 bucket>
         endpoint: minio:9000
         insecure: true
         secret_key: supersecret
diff --git a/charts/tempo-distributed/templates/admin-api/_helpers.tpl b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
new file mode 100644
index 0000000000..3b72a6633d
--- /dev/null
+++ b/charts/tempo-distributed/templates/admin-api/_helpers.tpl
@@ -0,0 +1,7 @@
+{{/*
+adminApi imagePullSecrets
+*/}}
+{{- define "tempo.adminApiImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.adminApi.image "global" .Values.global.image -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
index 469417a506..ae0d733c33 100644
--- a/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
+++ b/charts/tempo-distributed/templates/admin-api/admin-api-dep.yaml
@@ -37,12 +37,7 @@ spec:
         {{- with .Values.adminApi.initContainers }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.adminApiImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.adminApi.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
index 2b25560845..cb030eee62 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
+++ b/charts/tempo-distributed/templates/enterprise-gateway/_helpers.tpl
@@ -31,3 +31,11 @@ Return if ingress supports pathType.
 {{- define "tempo.ingress.supportsPathType" -}}
   {{- or (eq (include "tempo.ingress.isStable" .) "true") (and (eq (include "tempo.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) -}}
 {{- end -}}
+
+{{/*
+enterpriseGateway imagePullSecrets
+*/}}
+{{- define "tempo.enterpriseGatewayImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.enterpriseGateway.image "global" .Values.global.image -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
index 011322ddfc..0da57a1548 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
+++ b/charts/tempo-distributed/templates/enterprise-gateway/gateway-dep.yaml
@@ -35,12 +35,7 @@ spec:
         {{- toYaml .Values.enterpriseGateway.securityContext | nindent 8 }}
       initContainers:
         {{- toYaml .Values.enterpriseGateway.initContainers | nindent 8 }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.enterpriseGatewayImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.enterpriseGateway.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/templates/enterprise-gateway/gateway-svc.yaml b/charts/tempo-distributed/templates/enterprise-gateway/gateway-svc.yaml
index 0698dc62b7..1c5c37b611 100644
--- a/charts/tempo-distributed/templates/enterprise-gateway/gateway-svc.yaml
+++ b/charts/tempo-distributed/templates/enterprise-gateway/gateway-svc.yaml
@@ -13,7 +13,13 @@ metadata:
     {{- toYaml .Values.enterpriseGateway.service.annotations | nindent 4 }}
   namespace: {{ .Release.Namespace | quote }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.enterpriseGateway.service.type }}
+  {{- with .Values.enterpriseGateway.service.clusterIP }}
+  clusterIP: {{ . }}
+  {{- end }}
+  {{- if and (eq "LoadBalancer" .Values.enterpriseGateway.service.type) .Values.enterpriseGateway.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.enterpriseGateway.service.loadBalancerIP }}
+  {{- end }}
   ports:
     - port: {{ .Values.enterpriseGateway.service.port | default (include "tempo.serverHttpListenPort" . ) }}
       protocol: TCP
diff --git a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
index 79abf99e9c..de84ca588b 100644
--- a/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
+++ b/charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml
@@ -55,6 +55,8 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      initContainers:
+        {{- toYaml .Values.ingester.initContainers | nindent 8 }}
       containers:
         - args:
             - -target=ingester
diff --git a/charts/tempo-distributed/templates/lib/service-monitor.tpl b/charts/tempo-distributed/templates/lib/service-monitor.tpl
index a068dff4a4..896110f61b 100644
--- a/charts/tempo-distributed/templates/lib/service-monitor.tpl
+++ b/charts/tempo-distributed/templates/lib/service-monitor.tpl
@@ -47,7 +47,8 @@ spec:
       scrapeTimeout: {{ . }}
       {{- end }}
       relabelings:
-        - sourceLabels: [job]
+        - action: replace
+          sourceLabels: [job]
           replacement: "{{ $.ctx.Release.Namespace }}/{{ $.component }}"
           targetLabel: job
         {{- if kindIs "string" .clusterLabel }}
diff --git a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
index 286e68c37e..02e330eda6 100644
--- a/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
+++ b/charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml
@@ -55,6 +55,8 @@ spec:
       hostAliases:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      initContainers:
+        {{- toYaml .Values.metricsGenerator.initContainers | nindent 8 }}
       containers:
         - args:
             - -target=metrics-generator
diff --git a/charts/tempo-distributed/templates/tokengen/__helpers.tpl b/charts/tempo-distributed/templates/tokengen/__helpers.tpl
new file mode 100644
index 0000000000..f23d971c38
--- /dev/null
+++ b/charts/tempo-distributed/templates/tokengen/__helpers.tpl
@@ -0,0 +1,7 @@
+{{/*
+tokengen-job imagePullSecrets
+*/}}
+{{- define "tempo.tokengenJobImagePullSecrets" -}}
+{{- $dict := dict "tempo" .Values.tempo.image "component" .Values.tokengenJob.image "global" .Values.global.image -}}
+{{- include "tempo.imagePullSecrets" $dict -}}
+{{- end }}
diff --git a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
index b73c699031..0af68007c7 100644
--- a/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
+++ b/charts/tempo-distributed/templates/tokengen/tokengen-job.yaml
@@ -17,7 +17,6 @@ spec:
   backoffLimit: 6
   completions: 1
   parallelism: 1
-  selector:
   template:
     metadata:
       labels:
@@ -33,12 +32,7 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.tokengenJob.securityContext | nindent 8 }}
-      {{- if .Values.tempo.image.pullSecrets }}
-      imagePullSecrets:
-      {{- range .Values.tempo.image.pullSecrets }}
-        - name: {{ . }}
-      {{- end }}
-      {{- end }}
+      {{- include "tempo.tokengenJobImagePullSecrets" . | nindent 6 -}}
       {{- with .Values.tokengenJob.hostAliases }}
       hostAliases:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tempo-distributed/values.yaml b/charts/tempo-distributed/values.yaml
index 3955e5c1bd..d47c76db75 100644
--- a/charts/tempo-distributed/values.yaml
+++ b/charts/tempo-distributed/values.yaml
@@ -112,6 +112,7 @@ ingester:
   #  - ip: 1.2.3.4
   #    hostnames:
   #      - domain.tld
+  initContainers: []
   autoscaling:
     # -- Enable autoscaling for the ingester. WARNING: Autoscaling ingesters can result in lost data. Only do this if you know what you're doing.
     enabled: false
@@ -239,6 +240,7 @@ metricsGenerator:
   #  - ip: 1.2.3.4
   #    hostnames:
   #      - domain.tld
+  initContainers: []
   image:
     # -- The Docker registry for the metrics-generator image. Overrides `tempo.image.registry`
     registry: null
@@ -1263,6 +1265,8 @@ config: |
     grpc_server_max_send_msg_size: {{ .Values.server.grpc_server_max_send_msg_size }}
     http_server_read_timeout: {{ .Values.server.http_server_read_timeout }}
     http_server_write_timeout: {{ .Values.server.http_server_write_timeout }}
+  cache:
+  {{- toYaml .Values.cache | nindent 2}}
   storage:
     trace:
       {{- if .Values.storage.trace.block.version }}
@@ -1294,14 +1298,6 @@ config: |
         path: /var/tempo/traces
       wal:
         path: /var/tempo/wal
-      {{- if .Values.memcached.enabled }}
-      cache: memcached
-      memcached:
-        consistent_hash: true
-        host: {{ include "tempo.fullname" . }}-memcached
-        service: memcached-client
-        timeout: 500ms
-      {{- end }}
 
 # Set Tempo server configuration
 # Refers to https://grafana.com/docs/tempo/latest/configuration/#server
@@ -1321,6 +1317,21 @@ server:
   # -- Write timeout for HTTP server
   http_server_write_timeout: 30s
 
+# Use this block to configure caches available throughout the application.
+# Multiple caches can be created and assigned roles which determine how they are used by Tempo.
+# https://grafana.com/docs/tempo/latest/configuration/#cache
+cache:
+  caches:
+    - memcached:
+        host: '{{ include "tempo.fullname" . }}-memcached'
+        service: memcached-client
+        consistent_hash: true
+        timeout: 500ms
+      roles:
+        - parquet-footer
+        - bloom
+        - frontend-search
+
 # To configure a different storage backend instead of local storage:
 # storage:
 #   trace:
@@ -1825,6 +1836,10 @@ gateway:
             proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
           }
 
+          location = /otlp/v1/traces {
+            proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
+          }
+
           location ^~ /api {
             proxy_pass       http://{{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
           }
@@ -1866,7 +1881,7 @@ enterprise:
     # -- Grafana Enterprise Metrics container image repository. Note: for Grafana Tempo use the value 'image.repository'
     repository: grafana/enterprise-traces
     # -- Grafana Enterprise Metrics container image tag. Note: for Grafana Tempo use the value 'image.tag'
-    tag: v2.3.2
+    tag: v2.4.0
     # Note: pullPolicy and optional pullSecrets are set in toplevel 'image' section, not here
 
 # In order to use Grafana Enterprise Traces features, you will need to provide the contents of your Grafana Enterprise Traces
@@ -1891,6 +1906,15 @@ tokengenJob:
   env: []
   extraEnvFrom: []
   annotations: {}
+  image:
+    # -- The Docker registry for the tokengenJob image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the tokengenJob image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the tokengenJob image. Overrides `tempo.image.tag`
+    tag: null
   initContainers: []
   # -- The SecurityContext for tokenjobgen containers
   containerSecurityContext:
@@ -1911,6 +1935,16 @@ adminApi:
     annotations: {}
     labels: {}
 
+  image:
+    # -- The Docker registry for the adminApi image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the adminApi image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the adminApi image. Overrides `tempo.image.tag`
+    tag: null
+
   initContainers: []
 
   strategy:
@@ -1998,12 +2032,30 @@ enterpriseGateway:
   #    hostnames:
   #      - domain.tld
 
+  image:
+    # -- The Docker registry for the enterpriseGateway image. Overrides `tempo.image.registry`
+    registry: null
+    # -- Optional list of imagePullSecrets. Overrides `tempo.image.pullSecrets`
+    pullSecrets: []
+    # -- Docker image repository for the enterpriseGateway image. Overrides `tempo.image.repository`
+    repository: null
+    # -- Docker image tag for the enterpriseGateway image. Overrides `tempo.image.tag`
+    tag: null
+
   annotations: {}
   service:
+    # -- Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod
+    port: null
+    # -- Type of the enterprise gateway service
+    type: ClusterIP
+    # -- ClusterIP of the enterprise gateway service
+    clusterIP: null
+    # -- Load balancer IPO address if service type is LoadBalancer for enterprise gateway service
+    loadBalancerIP: null
+    # -- Annotations for the enterprise gateway service
     annotations: {}
+    # -- Labels for enterprise gateway service
     labels: {}
-    # -- If the port is left undefined, the service will listen on the same port as the pod
-    port: null
 
   strategy:
     type: RollingUpdate
diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml
index 104e2126c5..5dfa24f2e6 100644
--- a/charts/tempo/Chart.yaml
+++ b/charts/tempo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.7.2
+version: 1.7.3
 appVersion: 2.3.1
 engine: gotpl
 home: https://grafana.net
diff --git a/charts/tempo/README.md b/charts/tempo/README.md
index 9e61f7a23b..07321130fd 100644
--- a/charts/tempo/README.md
+++ b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
+![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 
diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
index e0a521d8e3..f19418fb52 100644
--- a/charts/tempo/values.yaml
+++ b/charts/tempo/values.yaml
@@ -66,7 +66,7 @@ tempo:
       # backend: s3
       # store traces in s3
       # s3:
-      #   bucket: tempo                                   # store traces in this bucket
+      #   bucket: <your s3 bucket>                        # store traces in this bucket
       #   endpoint: s3.dualstack.us-east-2.amazonaws.com  # api endpoint
       #   access_key: ...                                 # optional. access key when using static credentials.
       #   secret_key: ...                                 # optional. secret key when using static credentials.