diff --git a/docker-bake.hcl b/docker-bake.hcl
index 24e28d800..5b6c8e355 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,6 +6,15 @@ group "companion-images" {
   targets = ["kroki-mermaid", "kroki-bpmn", "kroki-excalidraw", "kroki-diagramsnet"]
 }
 
+target "oci-labels" {
+  labels = {
+    "org.opencontainers.image.description" = "Kroki provides a unified API supporting multiple diagramming formats, making it easy to create diagrams from textual descriptions."
+    "org.opencontainers.image.url" = "https://kroki.io"
+    "org.opencontainers.image.source" = "https://github.com/yuzutech/kroki"
+    "org.opencontainers.image.licenses" = "MIT"
+  }
+}
+
 target "kroki" {
   context = "server"
   contexts = {
@@ -18,24 +27,44 @@ target "kroki" {
   }
   dockerfile = "ops/docker/jdk11-jammy/Dockerfile"
   tags = ["yuzutech/kroki:${TAG}"]
+  inherits = ["oci-labels"]
+  labels = {
+    "org.opencontainers.image.title" = "Kroki"
+  }
 }
 
 target "kroki-mermaid" {
   context = "mermaid"
   tags = ["yuzutech/kroki-mermaid:${TAG}"]
+  inherits = ["oci-labels"]
+  labels = {
+    "org.opencontainers.image.title" = "Kroki - Mermaid"
+  }
 }
 
 target "kroki-bpmn" {
   context = "bpmn"
   tags = ["yuzutech/kroki-bpmn:${TAG}"]
+  inherits = ["oci-labels"]
+  labels = {
+    "org.opencontainers.image.title" = "Kroki - BPMN"
+  }
 }
 
 target "kroki-excalidraw" {
   context = "excalidraw"
   tags = ["yuzutech/kroki-excalidraw:${TAG}"]
+  inherits = ["oci-labels"]
+  labels = {
+    "org.opencontainers.image.title" = "Kroki - Excalidraw"
+  }
 }
 
 target "kroki-diagramsnet" {
   context = "diagrams.net"
   tags = ["yuzutech/kroki-diagramsnet:${TAG}"]
+  inherits = ["oci-labels"]
+  labels = {
+    "org.opencontainers.image.title" = "Kroki - diagrams.net"
+  }
 }
diff --git a/server/ops/docker/jdk11-jammy/Dockerfile b/server/ops/docker/jdk11-jammy/Dockerfile
index e9be7a1b1..14823d690 100644
--- a/server/ops/docker/jdk11-jammy/Dockerfile
+++ b/server/ops/docker/jdk11-jammy/Dockerfile
@@ -243,13 +243,6 @@ ARG BLOCKDIAG_VERSION="3.1.0"
 ARG WIREVIZ_VERSION="0.3.3"
 ARG TARGETARCH
 
-LABEL \
-    org.opencontainers.image.title="Kroki" \
-    org.opencontainers.image.description="Kroki provides a unified API supporting multiple diagramming formats, making it easy to create diagrams from textual descriptions." \
-    org.opencontainers.image.url="https://kroki.io" \
-    org.opencontainers.image.source="https://github.com/yuzutech/kroki" \
-    org.opencontainers.image.licenses="MIT"
-
 RUN addgroup --gecos 1000 kroki && adduser --disabled-password --ingroup kroki -u 1000 kroki
 
 # For TikZ