diff --git a/Makefile b/Makefile
index 4a90b33..9384246 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 BUILDER := docker buildx
+TAG := git.schmidl.dev/schtobia/buildimage
 
 build: dockerfile
-	@${BUILDER} build --build-arg=GIT_COMMIT=$(shell git describe --tags --always --dirty) -t buildimage .
+	@${BUILDER} build --build-arg=GIT_COMMIT=$(shell git describe --always) --build-arg=VERSION=$(shell git describe --tags --always --dirty) --build-arg=TIMESTAMP="$(shell date -u -Iseconds)" -t ${TAG} .
diff --git a/dockerfile b/dockerfile
index 1211a50..ac22573 100644
--- a/dockerfile
+++ b/dockerfile
@@ -6,12 +6,25 @@ FROM debian:stable-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG GIT_COMMIT
+ARG VERSION
+ARG TIMESTAMP
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later" \
 org.opencontainers.image.base.name="docker.io/debian:stable-slim" \
-org.opencontainers.image.title=buildimage
+org.opencontainers.image.title=buildimage \
+org.opencontainers.image.source="https://git.schmidl.dev/schtobia/buildimage" \
+org.opencontainers.image.url="https://git.schmidl.dev/schtobia/buildimage"
+
 LABEL org.opencontainers.image.revision=${GIT_COMMIT}
+LABEL org.opencontainers.image.version=${VERSION}
+LABEL org.opencontainers.image.created=${TIMESTAMP}
 
 RUN apt update \
  && apt install --assume-yes --no-install-recommends \
         build-essential \
+        git \
  && find /var/lib/apt -type f -delete
+
+VOLUME /workdir
+WORKDIR /workdir
+
+ENTRY