diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile
index 5368c000..ff0b1797 100644
--- a/build/linux/Dockerfile
+++ b/build/linux/Dockerfile
@@ -12,6 +12,10 @@ COPY dist/kubectl /app/
 COPY static /app/static
 COPY config $HOME/.docker/
 
-LABEL io.portainer.agent true
+LABEL io.portainer.agent true \
+    org.opencontainers.image.title="Portainer Agent" \
+    org.opencontainers.image.description="The Portainer agent" \
+    org.opencontainers.image.source="https://github.com/portainer/agent" \
+    org.opencontainers.image.vendor="Portainer.io"
 
 ENTRYPOINT ["./agent"]
diff --git a/build/linux/alpine.Dockerfile b/build/linux/alpine.Dockerfile
index c5be9eba..ebbc355f 100644
--- a/build/linux/alpine.Dockerfile
+++ b/build/linux/alpine.Dockerfile
@@ -12,6 +12,10 @@ COPY dist/kubectl /app/
 COPY static /app/static
 COPY config $HOME/.docker/
 
-LABEL io.portainer.agent true
+LABEL io.portainer.agent true \
+    org.opencontainers.image.title="Portainer Agent" \
+    org.opencontainers.image.description="The Portainer agent" \
+    org.opencontainers.image.source="https://github.com/portainer/agent" \
+    org.opencontainers.image.vendor="Portainer.io"
 
 ENTRYPOINT ["./agent"]