diff --git a/release-manifest-image/Dockerfile b/release-manifest-image/Dockerfile
index 95e0a7a..b65b7bd 100644
--- a/release-manifest-image/Dockerfile
+++ b/release-manifest-image/Dockerfile
@@ -20,4 +20,4 @@ LABEL com.suse.image-type="release-manifest"
 LABEL com.suse.release-stage="released"
 # endlabelprefix
 
-COPY release_manifest.yaml release_images.yaml ./
+COPY release_manifest.yaml release_images.yaml tooling_manifest.yaml ./
diff --git a/release-manifest-image/_service b/release-manifest-image/_service
index 01ccdeb..99836f7 100644
--- a/release-manifest-image/_service
+++ b/release-manifest-image/_service
@@ -18,5 +18,16 @@
     <param name="var">CHART_REPO</param>
     <param name="eval">CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major})</param>
     <param name="var">CHART_MAJOR</param>
+</service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">tooling_manifest.yaml</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
+    <param name="var">IMG_REPO</param>
+    <param name="eval">KIWI_VERSION=$(rpm --macros=/root/.rpmmacros -E %kiwi_version)</param>
+    <param name="var">KIWI_VERSION</param>
+    <param name="eval">EIB_VERSION=$(rpm --macros=/root/.rpmmacros -E %eib_version)</param>
+    <param name="var">EIB_VERSION</param>
   </service>
 </services>
diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml
index b746dde..34f45c6 100644
--- a/release-manifest-image/release_manifest.yaml
+++ b/release-manifest-image/release_manifest.yaml
@@ -166,6 +166,10 @@ spec:
           releaseName: rancher-turtles-providers
           chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-providers'
           version: '%%CHART_MAJOR%%.0.4+up0.25.1'
+        - prettyName: Upgrade Controller
+          releaseName: upgrade-controller
+          chart: '%%CHART_REPO%%/%%CHART_PREFIX%%upgrade-controller'
+          version: '%%CHART_MAJOR%%.0.3+up0.1.3'
         - prettyName: CertManager
           releaseName: cert-manager
           chart: cert-manager
diff --git a/release-manifest-image/tooling_manifest.yaml b/release-manifest-image/tooling_manifest.yaml
new file mode 100644
index 0000000..0817b31
--- /dev/null
+++ b/release-manifest-image/tooling_manifest.yaml
@@ -0,0 +1,31 @@
+kiwi:
+  version: "10.2.29.1"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.2.29.1"
+
+eib:
+  version: "1.3.2"
+  image: "%%IMG_REPO%%/%%IMG_PREFIX%%edge-image-builder:1.3.2"
+
+baseImages:
+  iso:
+    x86_64:
+      default: "SL-Micro.x86_64-6.2-Default-SelfInstall-GM.install.iso"
+      security: "SL-Micro.x86_64-6.2-Default-SelfInstall-GM.install.iso"
+    aarch64:
+      default: "SL-Micro.aarch64-6.2-Default-SelfInstall-GM.install.iso"
+  raw:
+    x86_64:
+      default: "SL-Micro.x86_64-6.2-Default-GM.raw"
+      telco:   "SL-Micro.x86_64-6.2-Base-RT-GM.raw"
+    aarch64:
+      default: "SL-Micro.aarch64-6.2-Default-GM.raw"
+      telco:   "SL-Micro.aarch64-6.2-Base-RT-GM.raw"
+
+# Optional: Kiwi base image names (per arch) for convenience.
+kiwiBaseImages:
+  iso:
+    x86_64: "SL-Micro.x86_64-6.2.install.iso"
+    aarch64: "SL-Micro.aarch64-6.2.install.iso"
+  raw:
+    x86_64: "SL-Micro.x86_64-6.2.raw"
+    aarch64: "SL-Micro.aarch64-6.2.raw"