diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6c5c6aad..a944564f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
           persist-credentials: false
 
       - id: push-to-dockerhub
-        uses: grafana/shared-workflows/actions/build-push-to-dockerhub@1acd69f48c01d7aef5f209f94048dfeb789026db # build-push-to-dockerhub/v0.2.0
+        uses: grafana/shared-workflows/actions/build-push-to-dockerhub@74b7ce2ebd577c25266d972683e376d9f62d0b07 # build-push-to-dockerhub/v0.4.0
         with:
           repository: grafana/otel-lgtm
           context: docker
@@ -30,3 +30,7 @@ jobs:
           tags: |-
             type=match,pattern=v(.*),group=1
             latest
+          labels: |-
+            org.opencontainers.image.ref.name=${{ github.ref_name }}
+            vcs-ref=${{ github.sha }}
+            version=${{ github.ref_name }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8cac081f..83eeffaa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -109,4 +109,23 @@ ENV LOKI_VERSION=${LOKI_VERSION}
 ENV PYROSCOPE_VERSION=${PYROSCOPE_VERSION}
 ENV OPENTELEMETRY_COLLECTOR_VERSION=${OPENTELEMETRY_COLLECTOR_VERSION}
 
+# Re-label the final image, overriding any existing labels from the base image
+LABEL description="An open source backend for OpenTelemetry that's intended for development, demo, and testing environments."
+LABEL io.k8s.description="An open source backend for OpenTelemetry that's intended for development, demo, and testing environments."
+LABEL io.k8s.display-name="Grafana LGTM"
+LABEL maintainer="Grafana Labs"
+LABEL name="grafana/otel-lgtm"
+LABEL org.opencontainers.image.authors="Grafana Labs"
+LABEL org.opencontainers.image.documentation="https://github.com/grafana/docker-otel-lgtm/blob/main/README.md"
+LABEL org.opencontainers.image.vendor="Grafana Labs"
+LABEL org.opencontainers.image.title="Grafana OpenTelemetry LGTM"
+LABEL summary="An OpenTelemetry backend in a Docker image"
+LABEL url="https://github.com/grafana/docker-otel-lgtm"
+LABEL vendor="Grafana Labs"
+
+# Blank out labels inherited from the base image that we don't want
+LABEL cpe=""
+LABEL io.buildah.version=""
+LABEL release=""
+
 CMD ["/otel-lgtm/run-all.sh"]