diff --git a/.gitlab/ci/container-build.gitlab-ci.yml b/.gitlab/ci/container-build.gitlab-ci.yml
index 5a0078b..f7be117 100644
--- a/.gitlab/ci/container-build.gitlab-ci.yml
+++ b/.gitlab/ci/container-build.gitlab-ci.yml
@@ -115,6 +115,20 @@ manifest:rust:
     - generate-environment
     - container:rust
 
+container:definitions:
+  extends:
+    - .single-image-build-base
+  needs:
+    - generate-environment
+    - manifest:rust
+
+manifest:definitions:
+  extends:
+    - .manifest-create-base
+  needs:
+    - generate-environment
+    - container:definitions
+
 container:aquila:
   extends:
     - .single-image-build-base
@@ -136,7 +150,7 @@ container:draco:
     - .variant-image-build-base
   needs:
     - generate-environment
-    - manifest:rust
+    - manifest:definitions
   variables:
     NEED_PROJECT_DOWNLOAD: 'true'
   parallel:
@@ -171,7 +185,7 @@ container:taurus:
     - .single-image-build-base
   needs:
     - generate-environment
-    - manifest:rust
+    - manifest:definitions
   variables:
     NEED_PROJECT_DOWNLOAD: 'true'
 
diff --git a/container/definitions/Dockerfile b/container/definitions/Dockerfile
new file mode 100644
index 0000000..9350546
--- /dev/null
+++ b/container/definitions/Dockerfile
@@ -0,0 +1,16 @@
+ARG RETICULUM_IMAGE_TAG=local
+
+FROM ghcr.io/code0-tech/reticulum/ci-builds/rust:$RETICULUM_IMAGE_TAG
+
+WORKDIR /
+
+RUN apk add openssl-dev openssl-libs-static pkgconfig
+
+# renovate: datasource=crate depName=code0-cli
+ARG CODE0_CLI_VERSION=0.0.8
+RUN cargo install --version $CODE0_CLI_VERSION code0-cli
+
+# renovate: datasource=github-releases depName=code0-tech/code0-definition versioning=regex:^def-(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)$
+ARG DEFINITION_VERSION=def-0.0.20
+LABEL org.opencontainers.image.version=$DEFINITION_VERSION
+RUN code0-cli download -t $DEFINITION_VERSION
diff --git a/container/draco/Dockerfile b/container/draco/Dockerfile
index ed56440..b2a315d 100644
--- a/container/draco/Dockerfile
+++ b/container/draco/Dockerfile
@@ -1,5 +1,7 @@
 ARG RETICULUM_IMAGE_TAG=local
 
+FROM ghcr.io/code0-tech/reticulum/ci-builds/definitions:$RETICULUM_IMAGE_TAG AS definitions
+
 FROM ghcr.io/code0-tech/reticulum/ci-builds/rust:$RETICULUM_IMAGE_TAG AS builder
 ARG VARIANT
 
@@ -12,21 +14,11 @@ RUN sed -i "s/version = \"0.0.0\"/version = \"$RETICULUM_IMAGE_TAG\"/" Cargo.tom
 WORKDIR /draco/adapters/$VARIANT
 RUN cargo build --release
 
-RUN apk add openssl-dev openssl-libs-static pkgconfig
-
-# renovate: datasource=crate depName=code0-cli
-ARG CODE0_CLI_VERSION=0.0.8
-RUN cargo install --version $CODE0_CLI_VERSION code0-cli
-
-# renovate: datasource=github-releases depName=code0-tech/code0-definition versioning=regex:^def-(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)$
-ARG DEFINITION_VERSION=def-0.0.19
-RUN code0-cli download -f $VARIANT -t $DEFINITION_VERSION
-
 FROM alpine:3.22
 ARG VARIANT
 
 RUN apk --update add libc6-compat
 COPY --from=builder /draco/target/release/$VARIANT /draco
-COPY --from=builder /draco/adapters/$VARIANT/definitions /definitions
+COPY --from=definitions /definitions/$VARIANT /definitions/$VARIANT
 
 CMD ["/draco"]
diff --git a/container/taurus/Dockerfile b/container/taurus/Dockerfile
index c295f6c..289dc01 100644
--- a/container/taurus/Dockerfile
+++ b/container/taurus/Dockerfile
@@ -1,5 +1,7 @@
 ARG RETICULUM_IMAGE_TAG=local
 
+FROM ghcr.io/code0-tech/reticulum/ci-builds/definitions:$RETICULUM_IMAGE_TAG AS definitions
+
 FROM ghcr.io/code0-tech/reticulum/ci-builds/rust:$RETICULUM_IMAGE_TAG AS builder
 
 WORKDIR /taurus
@@ -10,20 +12,10 @@ RUN sed -i "s/version = \"0.0.0\"/version = \"$RETICULUM_IMAGE_TAG\"/" Cargo.tom
 
 RUN cargo build --release
 
-RUN apk add openssl-dev openssl-libs-static pkgconfig
-
-# renovate: datasource=crate depName=code0-cli
-ARG CODE0_CLI_VERSION=0.0.8
-RUN cargo install --version $CODE0_CLI_VERSION code0-cli
-
-# renovate: datasource=github-releases depName=code0-tech/code0-definition versioning=regex:^def-(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)$
-ARG DEFINITION_VERSION=def-0.0.19
-RUN code0-cli download -f standard -t $DEFINITION_VERSION
-
 FROM alpine:3.22
 
 RUN apk --update add libc6-compat
 COPY --from=builder /taurus/target/release/taurus /taurus
-COPY --from=builder /taurus/definitions /definitions
+COPY --from=definitions /definitions/standard /definitions/standard
 
 CMD ["/taurus"]