diff --git a/.github/workflows/docker-intellidocs.yml b/.github/workflows/docker-intellidocs.yml
index 53c726e6a..174389e77 100644
--- a/.github/workflows/docker-intellidocs.yml
+++ b/.github/workflows/docker-intellidocs.yml
@@ -132,7 +132,7 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-            type=sha,prefix={{branch}}-,format=short
+            type=sha,format=short
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push Docker image
diff --git a/Dockerfile b/Dockerfile
index 9ecdd2fa1..aa54da175 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,6 +95,14 @@ LABEL org.opencontainers.image.source="https://github.com/paperless-ngx/paperles
 LABEL org.opencontainers.image.url="https://github.com/paperless-ngx/paperless-ngx"
 LABEL org.opencontainers.image.licenses="GPL-3.0-only"
 
+# Build metadata labels
+ARG BUILD_DATE
+ARG VERSION
+ARG REVISION
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.revision="${REVISION}"
+
 ARG DEBIAN_FRONTEND=noninteractive
 
 # Buildx provided, must be defined to use though
@@ -105,6 +113,11 @@ ARG JBIG2ENC_VERSION=0.30
 ARG QPDF_VERSION=11.9.0
 ARG GS_VERSION=10.03.1
 
+# Image metadata variables with defaults
+ARG BUILD_DATE=unknown
+ARG VERSION=dev
+ARG REVISION=unknown
+
 # Set Python environment variables
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \