diff --git a/renovate.json b/renovate.json
index 0b8fe1d16f..2e41551147 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2228,6 +2228,18 @@
         "version: \"?(?<currentValue>.*?)\"?\\n"
       ]
     },
+    {
+      "customType": "regex",
+      "datasourceTemplate": "github-tags",
+      "depNameTemplate": "docker/model-cli",
+      "extractVersionTemplate": "^v(?<version>.+)$",
+      "fileMatch": [
+        "^tools/docker-model-cli/manifest.yaml$"
+      ],
+      "matchStrings": [
+        "version: \"?(?<currentValue>.*?)\"?\\n"
+      ]
+    },
     {
       "customType": "regex",
       "datasourceTemplate": "github-tags",
diff --git a/tools/docker-model-cli/Dockerfile.template b/tools/docker-model-cli/Dockerfile.template
new file mode 100644
index 0000000000..8cb567cd0e
--- /dev/null
+++ b/tools/docker-model-cli/Dockerfile.template
@@ -0,0 +1,23 @@
+#syntax=docker/dockerfile:1.15.1@sha256:9857836c9ee4268391bb5b09f9f157f3c91bb15821bb77969642813b0d00518d
+
+FROM ghcr.io/uniget-org/tools/make:latest AS make
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+
+FROM registry.gitlab.com/uniget-org/images/ubuntu:24.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
+ARG name
+ARG version
+COPY --link --from=go / /usr/local/
+COPY --link --from=make / /usr/local/
+WORKDIR /go/src/github.com/docker/model-cli
+ARG name
+ARG version
+RUN --mount=type=cache,target=/root/go/pkg/mod <<EOF
+check-clone "https://github.com/docker/model-cli" "v${version}"
+git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/docker/model-cli .
+make ce-release VERSION="${version}"
+cp dist/docker-model "${prefix}/libexec/docker/cli-plugins/"
+EOF
\ No newline at end of file
diff --git a/tools/docker-model-cli/manifest.yaml b/tools/docker-model-cli/manifest.yaml
new file mode 100644
index 0000000000..0cff2798e5
--- /dev/null
+++ b/tools/docker-model-cli/manifest.yaml
@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
+$schema: https://tools.uniget.dev/schema.yaml
+name: docker-model-cli
+license:
+  name: Apache License 2.0
+  link: https://github.com/docker/model-runner/blob/main/LICENSE
+version: "0.1.19"
+binary: docker-model
+check: ${binary} version 2>&1 | cut -d' ' -f5
+build_dependencies:
+- go
+- make
+platforms:
+- linux/amd64
+- linux/arm64
+tags:
+- org/docker
+- category/development
+- lang/go
+- type/cli
+- ai
+homepage: https://github.com/docker/model-cli
+repository: https://github.com/docker/model-cli
+description: Docker Model Runner CLI Plugin
+renovate:
+  datasource: github-tags
+  package: docker/model-cli
+  extractVersion: ^v(?<version>.+)$
+  priority: low
\ No newline at end of file
diff --git a/tools/docker-model-distribution/Dockerfile.template b/tools/docker-model-distribution/Dockerfile.template
new file mode 100644
index 0000000000..ab601052b4
--- /dev/null
+++ b/tools/docker-model-distribution/Dockerfile.template
@@ -0,0 +1,24 @@
+#syntax=docker/dockerfile:1.15.1@sha256:9857836c9ee4268391bb5b09f9f157f3c91bb15821bb77969642813b0d00518d
+
+FROM ghcr.io/uniget-org/tools/make:latest AS make
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+
+FROM registry.gitlab.com/uniget-org/images/ubuntu:24.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
+ARG name
+ARG version
+COPY --link --from=go / /usr/local/
+COPY --link --from=make / /usr/local/
+WORKDIR /go/src/github.com/docker/model-distribution
+ARG name
+ARG version
+RUN --mount=type=cache,target=/root/go/pkg/mod <<EOF
+#check-clone "https://github.com/docker/model-distribution" "v${version}"
+#git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/docker/model-distribution .
+git clone -q --config advice.detachedHead=false --depth 1 --branch "main" https://github.com/docker/model-distribution .
+make build
+cp bin/model-distribution-tool "${prefix}/bin/"
+EOF
\ No newline at end of file
diff --git a/tools/docker-model-distribution/manifest.yaml b/tools/docker-model-distribution/manifest.yaml
new file mode 100644
index 0000000000..ae45809711
--- /dev/null
+++ b/tools/docker-model-distribution/manifest.yaml
@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
+$schema: https://tools.uniget.dev/schema.yaml
+name: docker-model-distribution
+license:
+  name: Apache License 2.0
+  link: https://github.com/docker/model-runner/blob/main/LICENSE
+version: "0.0.0"
+binary: model-distribution-tool
+check: ${binary} --version | cut -d' ' -f3
+build_dependencies:
+- go
+- make
+platforms:
+- linux/amd64
+- linux/arm64
+tags:
+- org/docker
+- category/development
+- lang/go
+- type/cli
+- ai
+homepage: https://github.com/docker/model-distribution
+repository: https://github.com/docker/model-distribution
+description: Library and CLI tool for distributing models using container registries
+#renovate:
+#  datasource: github-releases
+#  package: docker/model-distribution
+#  extractVersion: ^v(?<version>.+)$
+#  priority: low
\ No newline at end of file
diff --git a/tools/docker-model-runner/Dockerfile.template b/tools/docker-model-runner/Dockerfile.template
new file mode 100644
index 0000000000..ec759dfd99
--- /dev/null
+++ b/tools/docker-model-runner/Dockerfile.template
@@ -0,0 +1,24 @@
+#syntax=docker/dockerfile:1.15.1@sha256:9857836c9ee4268391bb5b09f9f157f3c91bb15821bb77969642813b0d00518d
+
+FROM ghcr.io/uniget-org/tools/make:latest AS make
+FROM ghcr.io/uniget-org/tools/go:latest AS go
+
+FROM registry.gitlab.com/uniget-org/images/ubuntu:24.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
+ARG name
+ARG version
+COPY --link --from=go / /usr/local/
+COPY --link --from=make / /usr/local/
+WORKDIR /go/src/github.com/docker/model-runner
+ARG name
+ARG version
+RUN --mount=type=cache,target=/root/go/pkg/mod <<EOF
+#check-clone "https://github.com/docker/model-runner" "v${version}"
+#git clone -q --config advice.detachedHead=false --depth 1 --branch "v${version}" https://github.com/docker/model-runner .
+git clone -q --config advice.detachedHead=false --depth 1 --branch "main" https://github.com/docker/model-runner .
+make build
+mv model-runner "${prefix}/bin/"
+EOF
\ No newline at end of file
diff --git a/tools/docker-model-runner/manifest.yaml b/tools/docker-model-runner/manifest.yaml
new file mode 100644
index 0000000000..c520c45bf8
--- /dev/null
+++ b/tools/docker-model-runner/manifest.yaml
@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://tools.uniget.dev/schema.yaml
+$schema: https://tools.uniget.dev/schema.yaml
+name: docker-model-runner
+license:
+  name: Apache License 2.0
+  link: https://github.com/docker/model-runner/blob/main/LICENSE
+version: "0.0.0"
+binary: model-runner
+check: "" # No version parameter
+build_dependencies:
+- go
+- make
+platforms:
+- linux/amd64
+- linux/arm64
+tags:
+- org/docker
+- category/development
+- lang/go
+- type/daemon
+- ai
+homepage: https://github.com/docker/model-runner
+repository: https://github.com/docker/model-runner
+description: Docker Model Runner
+#renovate:
+#  datasource: github-releases
+#  package: docker/model-runner
+#  extractVersion: ^v(?<version>.+)$
+#  priority: low
\ No newline at end of file