diff --git a/linux/ubuntu/act/Dockerfile b/linux/ubuntu/act/Dockerfile
index 70be3ab..6363090 100644
--- a/linux/ubuntu/act/Dockerfile
+++ b/linux/ubuntu/act/Dockerfile
@@ -70,8 +70,17 @@ RUN set -Eeuxo pipefail \
     && rm -rf /tmp/* \
     && printf "Cleaned up image\n"
 
-# > Home repository
-LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images"
+ARG BUILD_TAG_VERSION="master"
+ARG BUILD_TAG="act"
+ARG BUILD_REF="master"
+
+LABEL org.opencontainers.image.vendor="catthehacker"
+LABEL org.opencontainers.image.authors="me@hackerc.at"
+LABEL org.opencontainers.image.url="https://github.com/catthehacker/docker_images"
+LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images.git"
+LABEL org.opencontainers.image.version=${BUILD_TAG_VERSION}
+LABEL org.opencontainers.image.title=${BUILD_TAG}
+LABEL org.opencontainers.image.revision=${BUILD_REF}
 
 USER root
 
diff --git a/linux/ubuntu/runner/Dockerfile b/linux/ubuntu/runner/Dockerfile
index 812771e..fe8790f 100644
--- a/linux/ubuntu/runner/Dockerfile
+++ b/linux/ubuntu/runner/Dockerfile
@@ -85,8 +85,18 @@ RUN set -Eeuxo pipefail && \
     printf "runner user: $(su - ${RUNNER_USER} -c id)\n" && \
     printf "Created non-root user $(grep ${RUNNER_USER} /etc/passwd)\n"
 
-# > Home repository
-LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images"
+ARG BUILD_TAG_VERSION="master"
+ARG BUILD_TAG="runner"
+ARG BUILD_REF="master"
+
+LABEL org.opencontainers.image.vendor="catthehacker"
+LABEL org.opencontainers.image.authors="me@hackerc.at"
+LABEL org.opencontainers.image.url="https://github.com/catthehacker/docker_images"
+LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images.git"
+LABEL org.opencontainers.image.version=${BUILD_TAG_VERSION}
+LABEL org.opencontainers.image.title=${BUILD_TAG}
+LABEL org.opencontainers.image.revision=${BUILD_REF}
+
 
 # > Don't run as root, generally not good idea
 USER ${RUNNER_USER}:${RUNNER_USER}