diff --git a/Dockerfile b/Dockerfile
index fa06b86..c96beb9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,10 +5,11 @@ FROM ${OS_NAME}:${OS_VERSION} as frr-builder
 
 ARG FRR_TAG
 ARG RTR_TAG
-ENV LIBYANG_URL=https://deb.frrouting.org/frr/libyang1 \
-    LIBYANG_DEV_PKG=libyang-dev_1.0.176-2_amd64.deb \
-    LIBYANG_PKG=libyang1_1.0.176-2_amd64.deb \
-    DEBCONF_NONINTERACTIVE_SEEN=true \
+ARG LIBYANG_URL
+ARG LIBYANG_DEV_PKG
+ARG LIBYANG_PKG
+
+ENV DEBCONF_NONINTERACTIVE_SEEN=true \
     DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /artifacts
@@ -38,7 +39,7 @@ RUN set -ex \
  && git config --global user.email "ci@metal-stack.io" \
  && git config --global user.name "metal stack" \
  && git commit -m "Activate cumulus datacenter defaults." debian/rules \
- && ./tools/tarsource.sh -V \
+ && (./tools/tarsource.sh -V || true) \
  # # FIX for
  # dh_install: warning: Cannot find (any matches for) "doc/user/_build/texinfo/*.png" (tried in ., debian/tmp)
  && mkdir -p  doc/user/_build/texinfo && touch doc/user/_build/texinfo/fake.png \
diff --git a/docker-make.debian.yaml b/docker-make.debian.yaml
index e93a955..dec1707 100644
--- a/docker-make.debian.yaml
+++ b/docker-make.debian.yaml
@@ -8,8 +8,19 @@ default-build-args:
   - OS_VERSION=12
   - RTR_TAG=v0.7.0
 builds:
+  - name: FRR 9.0.1 for Debian 12
+    tags:
+      - 9.0.1-debian-12
+    build-args:
+      - FRR_TAG=frr-9.0.1
+      - LIBYANG_URL=https://deb.frrouting.org/frr/pool/frr-9/liby/libyang2
+      - LIBYANG_PKG=libyang2_2.1.80-1~deb12u1_amd64.deb
+      - LIBYANG_DEV_PKG=libyang2-dev_2.1.80-1~deb12u1_amd64.deb
   - name: FRR 7.5.1 for Debian 12
     tags:
       - 7.5.1-debian-12
     build-args:
       - FRR_TAG=frr-7.5.1
+      - LIBYANG_URL=https://deb.frrouting.org/frr/libyang1
+      - LIBYANG_PKG=libyang1_1.0.176-2_amd64.deb
+      - LIBYANG_DEV_PKG=libyang-dev_1.0.176-2_amd64.deb
diff --git a/docker-make.ubuntu.yaml b/docker-make.ubuntu.yaml
index 7c44590..fc87473 100644
--- a/docker-make.ubuntu.yaml
+++ b/docker-make.ubuntu.yaml
@@ -6,10 +6,20 @@ registry-host: ghcr.io
 default-build-args:
   - OS_NAME=ubuntu
   - OS_VERSION=22.04
-  - RTR_TAG=v0.7.0
 builds:
+  - name: FRR 9.0.1 for Ubuntu 22.04
+    tags:
+      - 9.0.1-ubuntu-22.04
+    build-args:
+      - FRR_TAG=frr-9.0.1
+      - LIBYANG_URL=https://deb.frrouting.org/frr/pool/frr-9/liby/libyang2
+      - LIBYANG_PKG=libyang2_2.1.80-1~ubuntu22.04u1_amd64.deb
+      - LIBYANG_DEV_PKG=libyang2-dev_2.1.80-1~ubuntu22.04u1_amd64.deb
   - name: FRR 7.5.1 for Ubuntu 22.04
     tags:
       - 7.5.1-ubuntu-22.04
     build-args:
       - FRR_TAG=frr-7.5.1
+      - LIBYANG_URL=https://deb.frrouting.org/frr/libyang1
+      - LIBYANG_PKG=libyang1_1.0.176-2_amd64.deb
+      - LIBYANG_DEV_PKG=libyang-dev_1.0.176-2_amd64.deb