diff --git a/.cargo/config.toml b/.cargo/config.toml
index b6cf3ff25..54e07b717 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +1,3 @@
 [alias]
 patchable = ["run", "--bin", "patchable", "--"]
+boil = ["run", "--bin", "boil", "--"]
diff --git a/.github/workflows/boil_build_release.yaml b/.github/workflows/boil_build_release.yaml
new file mode 100644
index 000000000..45144b31b
--- /dev/null
+++ b/.github/workflows/boil_build_release.yaml
@@ -0,0 +1,92 @@
+---
+name: Build/Release boil
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/boil_build_release.yaml'
+      - 'rust-toolchain.toml'
+      - 'Cargo.*'
+      - '**.rs'
+  push:
+    tags:
+      - "boil-[0-9]+.[0-9]+.[0-9]+**"
+
+env:
+  RUST_VERSION: 1.87.0
+
+jobs:
+  # This job is always run to ensure we don't miss any new upstream advisories
+  cargo-deny:
+    name: Run cargo-deny
+    runs-on: ubuntu-latest
+    # Prevent sudden announcement of a new advisory from failing CI
+    continue-on-error: ${{ matrix.checks == 'advisories' }}
+    strategy:
+      matrix:
+        checks:
+          - advisories
+          - bans licenses sources
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          submodules: recursive
+
+      - name: Run cargo-deny
+        uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
+        with:
+          command: check ${{ matrix.checks }}
+
+  create-release:
+    name: Create Draft Release
+    if: github.event_name == 'push'
+    needs:
+      - cargo-deny
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Draft Release
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        with:
+          draft: true
+
+  build:
+    name: Build boil
+    needs:
+      - cargo-deny
+    strategy:
+      fail-fast: false
+      matrix:
+        targets:
+          - {target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm}
+          - {target: x86_64-unknown-linux-gnu, os: ubuntu-latest}
+          - {target: aarch64-apple-darwin, os: macos-latest}
+    runs-on: ${{ matrix.targets.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+
+      - uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          targets: ${{ matrix.targets.target }}
+
+      - name: Build Binary
+        env:
+          TARGET: ${{ matrix.targets.target }}
+        run: cargo build --target "$TARGET" --release --package boil
+
+      - name: Rename Binary
+        env:
+          TARGET: ${{ matrix.targets.target }}
+        run: mv "target/$TARGET/release/boil" "boil-$TARGET"
+
+      - name: Upload Artifact to Release
+        if: github.event_name == 'push'
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        with:
+          draft: false
+          files: boil-${{ matrix.targets.target }}
diff --git a/.github/workflows/pr_pre-commit.yaml b/.github/workflows/pr_pre-commit.yaml
index faa7e5c54..51e470a02 100644
--- a/.github/workflows/pr_pre-commit.yaml
+++ b/.github/workflows/pr_pre-commit.yaml
@@ -5,6 +5,8 @@ on:
   pull_request:
 
 env:
+  # Keep in sync with across other repos like operator-rs and operator-templating
+  RUST_TOOLCHAIN_VERSION: "nightly-2025-05-26"
   HADOLINT_VERSION: "v2.12.0"
   PYTHON_VERSION: "3.12"
 
@@ -19,4 +21,5 @@ jobs:
       - uses: stackabletech/actions/run-pre-commit@497f3e3cbfe9b89b1e570351b97d050eebcad5d0 # 0.8.3
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+          rust: ${{ env.RUST_TOOLCHAIN_VERSION }}
           hadolint: ${{ env.HADOLINT_VERSION }}
diff --git a/.github/workflows/reusable_build_image.yaml b/.github/workflows/reusable_build_image.yaml
index a11cb8c80..5ae205d65 100644
--- a/.github/workflows/reusable_build_image.yaml
+++ b/.github/workflows/reusable_build_image.yaml
@@ -102,7 +102,7 @@ jobs:
     name: Failure Notification
     needs: [generate_matrix, build, publish_manifests]
     runs-on: ubuntu-latest
-    if: failure() || github.run_attempt > 1
+    if: failure() || (github.run_attempt > 1 && !cancelled())
     steps:
       - name: Send Notification
         uses: stackabletech/actions/send-slack-notification@55d2f9fcbcd7884ac929ea65fd6f069e7b7a49d2 # v0.8.1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0e71d9318..4af07cfe2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -60,3 +60,27 @@ repos:
         entry: .scripts/update_readme_badges.sh
         stages: [pre-commit, pre-merge-commit, manual]
         pass_filenames: false
+
+      - id: cargo-test
+        name: cargo-test
+        language: system
+        entry: cargo test
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: cargo-rustfmt
+        name: cargo-rustfmt
+        language: system
+        entry: cargo +nightly-2025-05-26 fmt --all -- --check
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$
+
+      - id: cargo-clippy
+        name: cargo-clippy
+        language: system
+        entry: cargo clippy --all-targets -- -D warnings
+        stages: [pre-commit, pre-merge-commit]
+        pass_filenames: false
+        files: \.rs$
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..b3ec3613b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+  "rust-analyzer.rustfmt.overrideCommand": [
+    "rustfmt",
+    // Keep in sync with across other repos like operator-rs and operator-templating
+    "+nightly-2025-05-26",
+    "--edition",
+    "2024",
+    "--"
+  ],
+}
diff --git a/Cargo.lock b/Cargo.lock
index 2b20caacd..0412df929 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -47,7 +62,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -58,7 +73,7 @@ checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
  "once_cell",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -67,18 +82,60 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
 [[package]]
 name = "bitflags"
 version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
+[[package]]
+name = "boil"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "clap_complete",
+ "git2",
+ "glob",
+ "oci-spec",
+ "rstest",
+ "semver",
+ "serde",
+ "serde_json",
+ "snafu",
+ "strum",
+ "time",
+ "tokio",
+ "toml",
+ "url",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
 
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
 [[package]]
 name = "cc"
 version = "1.2.11"
@@ -98,9 +155,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.27"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -108,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.27"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -118,11 +175,20 @@ dependencies = [
  "strsim",
 ]
 
+[[package]]
+name = "clap_complete"
+version = "4.5.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5abde44486daf70c5be8b8f8f1b66c49f86236edf6fa2abadb4d961c4c6229a"
+dependencies = [
+ "clap",
+]
+
 [[package]]
 name = "clap_derive"
-version = "4.5.24"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -152,18 +218,104 @@ dependencies = [
  "libc",
  "once_cell",
  "unicode-width 0.2.0",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
 
+[[package]]
+name = "derive_builder"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+dependencies = [
+ "derive_builder_core",
+ "syn",
+]
+
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -194,7 +346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -203,6 +355,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -212,6 +370,49 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.1"
@@ -220,10 +421,28 @@ checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.13.3+wasi-0.2.2",
  "windows-targets",
 ]
 
+[[package]]
+name = "getset"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912"
+dependencies = [
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
 [[package]]
 name = "git2"
 version = "0.20.1"
@@ -239,6 +458,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -369,6 +594,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -414,6 +645,17 @@ dependencies = [
  "web-time",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -517,11 +759,11 @@ checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -530,14 +772,33 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -552,6 +813,32 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "oci-spec"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2078e2f6be932a4de9aca90a375a45590809dfb5a08d93ab1ee217107aceeb67"
+dependencies = [
+ "const_format",
+ "derive_builder",
+ "getset",
+ "regex",
+ "serde",
+ "serde_json",
+ "strum",
+ "strum_macros",
+ "thiserror",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.20.2"
@@ -576,12 +863,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "patchable"
 version = "0.1.0"
@@ -610,6 +891,12 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.31"
@@ -628,6 +915,37 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -654,17 +972,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -675,20 +984,64 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.29"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
-name = "regex-syntax"
-version = "0.8.5"
+name = "relative-path"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
+
+[[package]]
+name = "rstest"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5a3193c063baaa2a95a33f03035c8a72b83d97a54916055ba22d35ed3839d49"
+dependencies = [
+ "futures-timer",
+ "futures-util",
+ "rstest_macros",
+]
+
+[[package]]
+name = "rstest_macros"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c845311f0ff7951c5506121a9ad75aec44d083c31583b2ea5a30bcb0b0abba0"
+dependencies = [
+ "cfg-if",
+ "glob",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "relative-path",
+ "rustc_version",
+ "syn",
+ "unicode-ident",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
 
 [[package]]
 name = "rustix"
@@ -700,7 +1053,28 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+dependencies = [
+ "serde",
 ]
 
 [[package]]
@@ -723,11 +1097,23 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.140"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
 dependencies = [
  "serde",
 ]
@@ -747,6 +1133,21 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -786,6 +1187,28 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.96"
@@ -819,7 +1242,27 @@ dependencies = [
  "getrandom",
  "once_cell",
  "rustix",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -834,11 +1277,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
+ "itoa",
  "num-conv",
  "powerfmt",
  "serde",
@@ -848,15 +1292,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -872,40 +1316,91 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.46.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "slab",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
 dependencies = [
+ "indexmap",
  "serde",
  "serde_spanned",
- "toml_datetime",
- "toml_edit",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.23"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
+ "toml_datetime 0.6.11",
  "winnow",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b679217f2848de74cabd3e8fc5e6d66f40b7da40f8e1954d92054d9010690fd5"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -963,14 +1458,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -997,6 +1492,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -1006,6 +1507,7 @@ dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -1071,6 +1573,12 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
 [[package]]
 name = "wasi"
 version = "0.13.3+wasi-0.2.2"
@@ -1148,27 +1656,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "windows-targets",
 ]
 
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -1244,9 +1739,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.0"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 805dab66f..265a882a6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,14 +2,28 @@
 members = ["rust/*"]
 resolver = "2"
 
+[workspace.package]
+repository = "https://github.com/stackabletech/docker-images"
+authors = ["Stackable <info@stackable.tech>"]
+license = "Apache-2.0"
+
 [workspace.dependencies]
-clap = { version = "4.5.27", features = ["derive"] }
+clap = { version = "4.5.41", features = ["derive"] }
+clap_complete = "4.5.55"
 git2 = "0.20.1"
+glob = "0.3.2"
+oci-spec = "0.8.2"
+rstest = "0.26.1"
+semver = { version = "1.0.26", features = ["serde"] }
 serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.140"
 snafu = "0.8.5"
+strum = { version = "0.27.1", features = ["derive"] }
 tempfile = "3.16.0"
-time = { version = "0.3.37", features = ["parsing"] }
-toml = "0.8.19"
+time = { version = "0.3.41", features = ["parsing", "formatting"] }
+tokio = { version = "1.46.1", features = ["rt", "macros", "process"] }
+toml = "0.9.2"
 tracing = "0.1.41"
 tracing-indicatif = "0.3.9"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+url = { version = "2.5.4", features = ["serde"] }
diff --git a/README.md b/README.md
index a5f2602ea..efd84522c 100644
--- a/README.md
+++ b/README.md
@@ -15,45 +15,28 @@ This repository contains Dockerfiles and scripts to build base images for use wi
 
 ## Prerequisites
 
-* [Stackable Image Tools](https://github.com/stackabletech/image-tools) (`pip install image-tools-stackabletech`)
+* [boil](./rust/boil//README.md) (`cargo boil`)
 * Docker including the [`buildx` plugin](https://github.com/docker/buildx)
 * Optional: [OpenShift preflight tool](https://github.com/redhat-openshift-ecosystem/openshift-preflight) to verify an image for OpenShift
 
-## Build Product Images
+## Build Images
 
-Product images are published to the `oci.stackable.tech` registry under the `sdp` organization by default.
+Images are published to the `oci.stackable.tech` registry under the `sdp` organization by default.
 
-### Build single products locally
+### Build images locally
 
-To build and push product images to the default repository use this command:
+Consult the [boil README](./rust/boil//README.md) which contains a broad selection of different commands to build images locally.
 
-```sh
-bake --product zookeeper --image 0.0.0-dev --push
-```
-
-This will build images for Apache ZooKeeper versions as defined in the `conf.py` file, tag them with the `image-version` 0.0.0-dev and push them to the registry.
-
-You can select a specific version of a product to build using the syntax `product=version` e.g. to build Hive 3.1.3 you can use this command:
-
-```sh
-bake --product hive=3.1.3 -i 0.0.0-dev
-```
-
-> [!NOTE]
-> `-i` is the shorthand for `--image` (i.e. the resulting image tag)
-
-### Build all products locally
-
-To build all products in all versions locally you can use this command
-
-```sh
-bake --image-version 0.0.0-dev
-```
+### Build images via GitHub Actions
 
-### Build everything in GitHub
+There are individual GHA workflows (one for each image) which use a
+[reusable workflow](.github/workflows/reusable_build_image.yaml) to build all specified versions for
+both `amd64` and `arm64`. The workflow is triggered
 
-The GitHub action called `Build (and optionally publish) 0.0.0-dev images` can be triggered manually to do build all images in all versions.
-When triggered manually it will _not_ push the images to the registry.
+* by pushes to `main` to produce `0.0.0-dev` versions of the images,
+* by a regular schedule to rebuild `0.0.0-dev` versions of the images to avoid staleness,
+* by tag pushes to produce (release candidate) images for a particular SDP release,
+* and by manual workflow dispatches.
 
 ## Patches
 
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
index 837c50066..164edb912 100644
--- a/airflow/Dockerfile
+++ b/airflow/Dockerfile
@@ -3,19 +3,19 @@
 # - SecretsUsedInArgOrEnv : OPA_AUTH_MANAGER is a false positive and breaks the build.
 # check=error=true;skip=InvalidDefaultArgInFrom,SecretsUsedInArgOrEnv
 
-ARG GIT_SYNC
+ARG GIT_SYNC_VERSION
 
 # For updated versions check https://github.com/kubernetes/git-sync/releases
 # which should contain a image location (e.g. registry.k8s.io/git-sync/git-sync:v3.6.8)
-FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS gitsync-image
+FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC_VERSION} AS gitsync-image
 
-FROM stackable/image/shared/statsd-exporter AS statsd_exporter-builder
+FROM local-image/shared/statsd-exporter AS statsd_exporter-builder
 
-FROM stackable/image/vector AS opa-auth-manager-builder
+FROM local-image/vector AS opa-auth-manager-builder
 
 ARG OPA_AUTH_MANAGER
-ARG PYTHON
-ARG UV
+ARG PYTHON_VERSION
+ARG UV_VERSION
 
 COPY airflow/opa-auth-manager/${OPA_AUTH_MANAGER} /tmp/opa-auth-manager
 
@@ -23,10 +23,10 @@ WORKDIR /tmp/opa-auth-manager
 
 RUN <<EOF
 microdnf update
-microdnf install python${PYTHON}-pip
+microdnf install python${PYTHON_VERSION}-pip
 microdnf clean all
 
-pip${PYTHON} install --no-cache-dir uv==${UV}
+pip${PYTHON_VERSION} install --no-cache-dir uv==${UV_VERSION}
 
 # This folder is required by the tests to set up an sqlite database
 mkdir /root/airflow
@@ -37,23 +37,22 @@ uv run pytest --disable-warnings
 uv build
 EOF
 
-FROM stackable/image/vector AS airflow-build-image
+FROM local-image/vector AS airflow-build-image
 
-ARG PRODUCT
-ARG SHARED_STATSD_EXPORTER
-ARG PYTHON
+ARG PRODUCT_VERSION
+ARG SHARED_STATSD_EXPORTER_VERSION
+ARG PYTHON_VERSION
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
-ARG S3FS
-ARG CYCLONEDX_BOM
-ARG UV
-ARG EXTRAS
+ARG S3FS_VERSION
+ARG CYCLONEDX_BOM_VERSION
+ARG UV_VERSION
 
 # Airflow "extras" packages are listed here: https://airflow.apache.org/docs/apache-airflow/stable/extra-packages-ref.html
 # They evolve over time and thus belong to the version-specific arguments.
 # The mysql provider is currently excluded.
 # Requires implementation of https://github.com/apache/airflow/blob/2.2.5/scripts/docker/install_mysql.sh
-ENV AIRFLOW_EXTRAS=${EXTRAS}
+ARG AIRFLOW_EXTRAS
 
 RUN microdnf update && \
     microdnf install \
@@ -67,10 +66,10 @@ RUN microdnf update && \
         libpq-devel \
         openldap-devel \
         openssl-devel \
-        python${PYTHON} \
-        python${PYTHON}-devel \
-        python${PYTHON}-pip \
-        python${PYTHON}-wheel \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-devel \
+        python${PYTHON_VERSION}-pip \
+        python${PYTHON_VERSION}-wheel \
         # The airflow odbc provider can compile without the development files (headers and libraries) (see https://github.com/stackabletech/docker-images/pull/683)
         unixODBC \
         # Needed to modify the SBOM
@@ -78,23 +77,23 @@ RUN microdnf update && \
     microdnf clean all && \
     rm -rf /var/cache/yum
 
-COPY airflow/stackable/constraints/${PRODUCT}/constraints-python${PYTHON}.txt /tmp/constraints.txt
-COPY airflow/stackable/constraints/${PRODUCT}/build-constraints-python${PYTHON}.txt /tmp/build-constraints.txt
+COPY airflow/stackable/constraints/${PRODUCT_VERSION}/constraints-python${PYTHON_VERSION}.txt /tmp/constraints.txt
+COPY airflow/stackable/constraints/${PRODUCT_VERSION}/build-constraints-python${PYTHON_VERSION}.txt /tmp/build-constraints.txt
 COPY --from=opa-auth-manager-builder /tmp/opa-auth-manager/dist/opa_auth_manager-0.1.0-py3-none-any.whl /tmp/
 
 RUN <<EOF
-python${PYTHON} -m venv --system-site-packages /stackable/app
+python${PYTHON_VERSION} -m venv --system-site-packages /stackable/app
 
 source /stackable/app/bin/activate
 
 # Upgrade pip to the latest version
 # Also install uv to get support for build constraints
 pip install --no-cache-dir --upgrade pip
-pip install --no-cache-dir uv==${UV}
+pip install --no-cache-dir uv==${UV_VERSION}
 
-uv pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT} --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
+uv pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT_VERSION} --constraint /tmp/constraints.txt --build-constraints /tmp/build-constraints.txt
 # Needed for pandas S3 integration to e.g. write and read csv and parquet files to/from S3
-uv pip install --no-cache-dir s3fs==${S3FS} cyclonedx-bom==${CYCLONEDX_BOM}
+uv pip install --no-cache-dir s3fs==${S3FS_VERSION} cyclonedx-bom==${CYCLONEDX_BOM_VERSION}
 # Needed for OIDC
 uv pip install --no-cache-dir Flask_OIDC==2.2.0 Flask-OpenID==1.3.1
 
@@ -106,14 +105,14 @@ cyclonedx-py environment --schema-version 1.5 --outfile /tmp/sbom.json
 
 # Break circular dependencies by removing the apache-airflow dependency from the providers
 jq '.dependencies |= map(if .ref | test("^apache-airflow-providers-") then
-    .dependsOn |= map(select(. != "apache-airflow=='${PRODUCT}'"))
+    .dependsOn |= map(select(. != "apache-airflow=='${PRODUCT_VERSION}'"))
 else
     .
-end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT}.cdx.json
+end)' /tmp/sbom.json > /stackable/app/airflow-${PRODUCT_VERSION}.cdx.json
 EOF
 
 COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter
-COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json
+COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
 COPY --from=gitsync-image --chown=${STACKABLE_USER_UID}:0 /git-sync /stackable/git-sync
 
 RUN <<EOF
@@ -124,20 +123,20 @@ chmod --recursive g=u /stackable
 EOF
 
 
-FROM stackable/image/vector AS airflow-main-image
+FROM local-image/vector AS airflow-main-image
 
-ARG PRODUCT
-ARG PYTHON
-ARG RELEASE
-ARG TINI
+ARG PRODUCT_VERSION
+ARG PYTHON_VERSION
+ARG RELEASE_VERSION
+ARG TINI_VERSION
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
 
 LABEL name="Apache Airflow" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Apache Airflow." \
     description="This image is deployed by the Stackable Operator for Apache Airflow."
 
@@ -172,7 +171,7 @@ microdnf install \
   openssh-clients \
   openssl-libs \
   openssl-pkcs11 \
-  python${PYTHON} \
+  python${PYTHON_VERSION} \
   socat \
   unixODBC
 microdnf clean all
@@ -180,7 +179,7 @@ rm -rf /var/cache/yum
 
 # Get the correct `tini` binary for our architecture.
 # It is used as an init alternative in the entrypoint
-curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-${TARGETARCH}"
+curl -o /usr/bin/tini "https://repo.stackable.tech/repository/packages/tini/tini-${TINI_VERSION}-${TARGETARCH}"
 
 # fix missing permissions
 chmod a+x /entrypoint.sh
diff --git a/airflow/boil-config.toml b/airflow/boil-config.toml
new file mode 100644
index 000000000..652ee1a70
--- /dev/null
+++ b/airflow/boil-config.toml
@@ -0,0 +1,55 @@
+[versions."2.9.3".local-images]
+"shared/statsd-exporter" = "0.28.0"
+vector = "0.47.0"
+
+[versions."2.9.3".build-arguments]
+python-version = "3.9"
+git-sync-version = "v4.4.1"
+s3fs-version = "2024.9.0"
+cyclonedx-bom-version = "6.0.0"
+tini-version = "0.19.0"
+uv-version = "0.7.8"
+airflow-extras = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
+opa-auth-manager = "airflow-2"
+
+[versions."2.10.4".local-images]
+"shared/statsd-exporter" = "0.28.0"
+vector = "0.47.0"
+
+[versions."2.10.4".build-arguments]
+python-version = "3.12"
+git-sync-version = "v4.4.1"
+s3fs-version = "2024.9.0"
+cyclonedx-bom-version = "6.0.0"
+tini-version = "0.19.0"
+uv-version = "0.7.8"
+airflow-extras = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
+opa-auth-manager = "airflow-2"
+
+[versions."2.10.5".local-images]
+"shared/statsd-exporter" = "0.28.0"
+vector = "0.47.0"
+
+[versions."2.10.5".build-arguments]
+python-version = "3.12"
+git-sync-version = "v4.4.1"
+s3fs-version = "2024.9.0"
+cyclonedx-bom-version = "6.0.0"
+tini-version = "0.19.0"
+uv-version = "0.7.8"
+airflow-extras = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
+opa-auth-manager = "airflow-2"
+
+[versions."3.0.1".local-images]
+"shared/statsd-exporter" = "0.28.0"
+vector = "0.47.0"
+
+[versions."3.0.1".build-arguments]
+python-version = "3.12"
+git-sync-version = "v4.4.1"
+s3fs-version = "2024.9.0"
+cyclonedx-bom-version = "6.0.0"
+tini-version = "0.19.0"
+uv-version = "0.7.8"
+airflow-extras = "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino"
+opa-auth-manager = "airflow-3"
diff --git a/airflow/versions.py b/airflow/versions.py
deleted file mode 100644
index 9788be818..000000000
--- a/airflow/versions.py
+++ /dev/null
@@ -1,54 +0,0 @@
-versions = [
-    {
-        "product": "2.9.3",
-        "python": "3.9",
-        "git_sync": "v4.4.1",
-        "s3fs": "2024.9.0",
-        "cyclonedx_bom": "6.0.0",
-        "shared/statsd-exporter": "0.28.0",
-        "tini": "0.19.0",
-        "vector": "0.47.0",
-        "uv": "0.7.8",
-        "extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
-        "opa_auth_manager": "airflow-2",
-    },
-    {
-        "product": "2.10.4",
-        "python": "3.12",
-        "git_sync": "v4.4.1",
-        "s3fs": "2024.9.0",
-        "cyclonedx_bom": "6.0.0",
-        "shared/statsd-exporter": "0.28.0",
-        "tini": "0.19.0",
-        "vector": "0.47.0",
-        "uv": "0.7.8",
-        "extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
-        "opa_auth_manager": "airflow-2",
-    },
-    {
-        "product": "2.10.5",
-        "python": "3.12",
-        "git_sync": "v4.4.1",
-        "s3fs": "2024.9.0",
-        "cyclonedx_bom": "6.0.0",
-        "shared/statsd-exporter": "0.28.0",
-        "tini": "0.19.0",
-        "vector": "0.47.0",
-        "uv": "0.7.8",
-        "extras": "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino",
-        "opa_auth_manager": "airflow-2",
-    },
-    {
-        "product": "3.0.1",
-        "python": "3.12",
-        "git_sync": "v4.4.1",
-        "s3fs": "2024.9.0",
-        "cyclonedx_bom": "6.0.0",
-        "shared/statsd-exporter": "0.28.0",
-        "tini": "0.19.0",
-        "vector": "0.47.0",
-        "uv": "0.7.8",
-        "extras": "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino",
-        "opa_auth_manager": "airflow-3",
-    },
-]
diff --git a/boil.toml b/boil.toml
new file mode 100644
index 000000000..2325681a5
--- /dev/null
+++ b/boil.toml
@@ -0,0 +1,14 @@
+[build-arguments]
+STACKABLE_USER_NAME = "stackable"
+STACKABLE_USER_UID = "1000"
+STACKABLE_USER_GID = "1000"
+DELETE_CACHES = "true"
+
+[metadata]
+documentation = "https://docs.stackable.tech/home/stable/"
+source = "https://github.com/stackabletech/docker-images/"
+authors = "Stackable GmbH <info@stackable.tech>"
+vendor = "Stackable GmbH"
+licenses = "Apache-2.0"
+
+[docker-config]
diff --git a/conf.py b/conf.py
deleted file mode 100644
index bf62bbad2..000000000
--- a/conf.py
+++ /dev/null
@@ -1,135 +0,0 @@
-"""
-Configuration file for the Stackable image-tools: https://github.com/stackabletech/image-tools.
-
-Application images will be created for products and associated versions configured here.
-"""
-
-# NOTE: The .scripts/enumerate-product-versions.py script (used in the release workflow as of 2024-07-23) imports this file and it relies on conf.py being in its parent folder. Should this file be moved or the structure changed in any way remember to update that script as well!
-
-# NOTE (@NickLarsenNZ): Unfortunately, some directories have hyphens, so they need
-# importing in a special way. For consistency, we'll do them all the same way.
-import importlib
-
-airflow = importlib.import_module("airflow.versions")
-druid = importlib.import_module("druid.versions")
-hadoop = importlib.import_module("hadoop.versions")
-hadoop_jars = importlib.import_module("hadoop.hadoop.versions")
-hbase = importlib.import_module("hbase.versions")
-hbase_jars = importlib.import_module("hbase.hbase.versions")
-hbase_phoenix = importlib.import_module("hbase.phoenix.versions")
-hbase_opa_authorizer = importlib.import_module("hbase.hbase-opa-authorizer.versions")
-hbase_operator_tools = importlib.import_module("hbase.hbase-operator-tools.versions")
-hive = importlib.import_module("hive.versions")
-java_base = importlib.import_module("java-base.versions")
-java_devel = importlib.import_module("java-devel.versions")
-jdk_base = importlib.import_module("jdk-base.versions")
-kafka = importlib.import_module("kafka.versions")
-krb5 = importlib.import_module("krb5.versions")
-vector = importlib.import_module("vector.versions")
-nifi = importlib.import_module("nifi.versions")
-omid = importlib.import_module("omid.versions")
-opa = importlib.import_module("opa.versions")
-opensearch = importlib.import_module("opensearch.versions")
-opensearch_security_plugin = importlib.import_module(
-    "opensearch.security-plugin.versions"
-)
-opensearch_prometheus_exporter = importlib.import_module(
-    "opensearch.opensearch-prometheus-exporter.versions"
-)
-spark_k8s = importlib.import_module("spark-k8s.versions")
-stackable_base = importlib.import_module("stackable-base.versions")
-stackable_devel = importlib.import_module("stackable-devel.versions")
-superset = importlib.import_module("superset.versions")
-trino_cli = importlib.import_module("trino-cli.versions")
-trino = importlib.import_module("trino.versions")
-trino_jars = importlib.import_module("trino.trino.versions")
-trino_storage_connector = importlib.import_module("trino.storage-connector.versions")
-kafka_testing_tools = importlib.import_module("kafka-testing-tools.versions")
-kcat = importlib.import_module("kafka.kcat.versions")
-kafka_opa_plugin = importlib.import_module("kafka.kafka-opa-plugin.versions")
-testing_tools = importlib.import_module("testing-tools.versions")
-zookeeper = importlib.import_module("zookeeper.versions")
-tools = importlib.import_module("tools.versions")
-statsd_exporter = importlib.import_module("shared.statsd-exporter.versions")
-spark_connect_client = importlib.import_module("spark-connect-client.versions")
-
-products = [
-    {"name": "airflow", "versions": airflow.versions},
-    {"name": "druid", "versions": druid.versions},
-    {"name": "hadoop", "versions": hadoop.versions},
-    {"name": "hadoop/hadoop", "versions": hadoop_jars.versions},
-    {"name": "hbase", "versions": hbase.versions},
-    {"name": "hbase/hbase", "versions": hbase_jars.versions},
-    {"name": "hbase/phoenix", "versions": hbase_phoenix.versions},
-    {"name": "hbase/hbase-opa-authorizer", "versions": hbase_opa_authorizer.versions},
-    {"name": "hbase/hbase-operator-tools", "versions": hbase_operator_tools.versions},
-    {"name": "hive", "versions": hive.versions},
-    {"name": "java-base", "versions": java_base.versions},
-    {"name": "java-devel", "versions": java_devel.versions},
-    {"name": "jdk-base", "versions": jdk_base.versions},
-    {"name": "kafka", "versions": kafka.versions},
-    {"name": "krb5", "versions": krb5.versions},
-    {"name": "vector", "versions": vector.versions},
-    {"name": "nifi", "versions": nifi.versions},
-    {"name": "omid", "versions": omid.versions},
-    {"name": "opa", "versions": opa.versions},
-    {"name": "opensearch", "versions": opensearch.versions},
-    {
-        "name": "opensearch/security-plugin",
-        "versions": opensearch_security_plugin.versions,
-    },
-    {
-        "name": "opensearch/opensearch-prometheus-exporter",
-        "versions": opensearch_prometheus_exporter.versions,
-    },
-    {"name": "spark-k8s", "versions": spark_k8s.versions},
-    {"name": "stackable-base", "versions": stackable_base.versions},
-    {"name": "stackable-devel", "versions": stackable_devel.versions},
-    {"name": "superset", "versions": superset.versions},
-    {"name": "trino-cli", "versions": trino_cli.versions},
-    {"name": "trino", "versions": trino.versions},
-    {"name": "trino/trino", "versions": trino_jars.versions},
-    {"name": "trino/storage-connector", "versions": trino_storage_connector.versions},
-    {"name": "kafka-testing-tools", "versions": kafka_testing_tools.versions},
-    {"name": "kafka/kcat", "versions": kcat.versions},
-    {"name": "kafka/kafka-opa-plugin", "versions": kafka_opa_plugin.versions},
-    {"name": "testing-tools", "versions": testing_tools.versions},
-    {"name": "zookeeper", "versions": zookeeper.versions},
-    {"name": "tools", "versions": tools.versions},
-    {"name": "shared/statsd-exporter", "versions": statsd_exporter.versions},
-    {"name": "spark-connect-client", "versions": spark_connect_client.versions},
-]
-
-open_shift_projects = {
-    "airflow": {"id": "62613f498ccb9938ba3cfde6"},
-    "druid": {"id": "626140028ccb9938ba3cfde7"},
-    "hadoop": {"id": "6261407f887d6e0b8614660c"},
-    "hbase": {"id": "62614109992bac3f9a4a24b8"},
-    "hive": {"id": "626140806812078a392dceaa"},
-    "kafka": {"id": "625ff25b91bdcd4b49c823a4"},
-    "nifi": {"id": "625586a32e9e14bc8118e203"},
-    "opa": {"id": "6255838bea1feb8bec4aaaa3"},
-    "opensearch": {"id": "6880fe690db664aa303d3a28"},
-    "spark-k8s": {"id": "62613e81f8ce82a2f247dda5"},
-    "superset": {"id": "62557e5fea1feb8bec4aaaa0"},
-    "tools": {"id": "62557cd575ab7e30884aaaa0"},
-    "trino": {"id": "62557c4a0030f6483318e203"},
-    "zookeeper": {"id": "62552b0aadd9d54d56cda11d"},
-}
-
-cache = [
-    {
-        "type": "registry",
-        "ref_prefix": "build-repo.stackable.tech:8083/sandbox/cache",
-        "mode": "max",
-        "compression": "zstd",
-        "ignore-error": "true",
-    },
-]
-
-args = {
-    "STACKABLE_USER_NAME": "stackable",
-    "STACKABLE_USER_UID": "1000",
-    "STACKABLE_USER_GID": "1000",
-    "DELETE_CACHES": "true",
-}
diff --git a/deny.toml b/deny.toml
new file mode 100644
index 000000000..e3067ac08
--- /dev/null
+++ b/deny.toml
@@ -0,0 +1,57 @@
+# This file is the source of truth for all our repos!
+# This includes repos not templated by operator-templating, please copy/paste the file for this repos.
+
+# TIP: Use "cargo deny check" to check if everything is fine
+
+[graph]
+targets = [
+  { triple = "x86_64-unknown-linux-gnu" },
+  { triple = "aarch64-unknown-linux-gnu" },
+  { triple = "x86_64-unknown-linux-musl" },
+  { triple = "aarch64-apple-darwin" },
+  { triple = "x86_64-apple-darwin" },
+]
+
+[advisories]
+yanked = "deny"
+
+[bans]
+multiple-versions = "allow"
+
+[licenses]
+unused-allowed-license = "allow"
+confidence-threshold = 1.0
+allow = [
+  "Apache-2.0",
+  "BSD-2-Clause",
+  "BSD-3-Clause",
+  "CC0-1.0",
+  "ISC",
+  "LicenseRef-ring",
+  "LicenseRef-webpki",
+  "MIT",
+  "MPL-2.0",
+  "OpenSSL",           # Needed for the ring and/or aws-lc-sys crate. See https://github.com/stackabletech/operator-templating/pull/464 for details
+  "Unicode-3.0",
+  "Unicode-DFS-2016",
+  "Zlib",
+  "Unlicense",
+]
+private = { ignore = true }
+
+[[licenses.clarify]]
+name = "ring"
+expression = "LicenseRef-ring"
+license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
+
+[[licenses.clarify]]
+name = "webpki"
+expression = "LicenseRef-webpki"
+license-files = [{ path = "LICENSE", hash = 0x001c7e6c }]
+
+[sources]
+unknown-registry = "deny"
+unknown-git = "deny"
+
+[sources.allow-org]
+github = ["stackabletech"]
diff --git a/druid/Dockerfile b/druid/Dockerfile
index 9eeb3263d..3231d11ae 100644
--- a/druid/Dockerfile
+++ b/druid/Dockerfile
@@ -1,20 +1,20 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/java-devel AS druid-builder
+FROM local-image/java-devel AS druid-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG JACKSON_DATAFORMAT_XML
 ARG STAX2_API
 ARG WOODSTOX_CORE
-ARG AUTHORIZER
+ARG AUTHORIZER_VERSION
 ARG STACKABLE_USER_UID
-ARG HADOOP_HADOOP
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
 
 # Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
 # This can be used to speed up builds when disk space is of no concern.
@@ -39,7 +39,7 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/patchable.toml /stackable/src/druid/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/${PRODUCT} /stackable/src/druid/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/${PRODUCT_VERSION} /stackable/src/druid/stackable/patches/${PRODUCT_VERSION}
 
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs /stackable/patched-libs
 # Cache mounts are owned by root by default
@@ -52,17 +52,17 @@ COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-li
 
 # Let's have patchable as a dedicated step, as it fetches the druid sourcecode over the network,
 # thus taking a bit (which is annoying while development)
-RUN /stackable/patchable --images-repo-root=src checkout druid ${PRODUCT} > /tmp/DRUID_SOURCE_DIR
+RUN /stackable/patchable --images-repo-root=src checkout druid ${PRODUCT_VERSION} > /tmp/DRUID_SOURCE_DIR
 
-RUN --mount=type=cache,id=maven-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository \
-  --mount=type=cache,id=npm-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.npm \
-  --mount=type=cache,id=cache-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.cache \
+RUN --mount=type=cache,id=maven-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository \
+  --mount=type=cache,id=npm-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.npm \
+  --mount=type=cache,id=cache-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.cache \
   <<EOF
 cd "$(cat /tmp/DRUID_SOURCE_DIR)" || exit 1
 rm /tmp/DRUID_SOURCE_DIR
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -75,12 +75,12 @@ tar -czf /stackable/druid-${NEW_VERSION}-src.tar.gz .
 mvn \
   clean install \
   -Pdist,stackable-bundle-contrib-exts \
-  -Dhadoop.compile.version=${HADOOP_VERSION}-stackable${RELEASE} \
+  -Dhadoop.compile.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
   -DskipTests `# Skip test execution` \
   -Dcheckstyle.skip `# Skip checkstyle checks. We dont care if the code is properly formatted, it just wastes time` \
   -Dmaven.javadoc.skip=true `# Dont generate javadoc` \
   -Dmaven.gitcommitid.skip=true `# The gitcommitid plugin cannot work with git workspaces (ie: patchable)` \
-  $(if [[ ${PRODUCT} != 30.* ]]; then echo --projects '!quidem-ut'; fi) `# This is just a maven module for tests. https://github.com/apache/druid/pull/16867 added https://raw.githubusercontent.com/kgyrtkirk/datasets/repo/ as a Maven repository, which fails to pull for us (Failed to execute goal on project druid-quidem-ut: Could not resolve dependencies for project org.apache.druid:druid-quidem-ut:jar:33.0.0: com.github.kgyrtkirk.datasets:kttm-nested:jar:0.1 was not found in https://build-repo.stackable.tech/repository/maven-public/). By disabling the maven module we dont pull in this weird dependency...`
+  $(if [[ ${PRODUCT_VERSION} != 30.* ]]; then echo --projects '!quidem-ut'; fi) `# This is just a maven module for tests. https://github.com/apache/druid/pull/16867 added https://raw.githubusercontent.com/kgyrtkirk/datasets/repo/ as a Maven repository, which fails to pull for us (Failed to execute goal on project druid-quidem-ut: Could not resolve dependencies for project org.apache.druid:druid-quidem-ut:jar:33.0.0: com.github.kgyrtkirk.datasets:kttm-nested:jar:0.1 was not found in https://build-repo.stackable.tech/repository/maven-public/). By disabling the maven module we dont pull in this weird dependency...`
 
 mv distribution/target/apache-druid-${NEW_VERSION}-bin/apache-druid-${NEW_VERSION} /stackable/
 sed -i "s/${NEW_VERSION}/${ORIGINAL_VERSION}/g" distribution/target/bom.json
@@ -101,31 +101,31 @@ fi
 # testdata in kuttl tests and the getting started guide.
 
 # Install OPA authorizer extension.
-curl "https://repo.stackable.tech/repository/packages/druid/druid-opa-authorizer-${AUTHORIZER}.tar.gz" | tar -xzC /stackable/apache-druid-${NEW_VERSION}/extensions
+curl "https://repo.stackable.tech/repository/packages/druid/druid-opa-authorizer-${AUTHORIZER_VERSION}.tar.gz" | tar -xzC /stackable/apache-druid-${NEW_VERSION}/extensions
 
 # change groups
 chmod -R g=u /stackable
 EOF
 
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 ARG NAME="Apache Druid"
 ARG DESCRIPTION="This image is deployed by the Stackable Operator for Apache Druid"
 
 LABEL name="${NAME}"
-LABEL version="${PRODUCT}"
-LABEL release="${RELEASE}"
+LABEL version="${PRODUCT_VERSION}"
+LABEL release="${RELEASE_VERSION}"
 LABEL summary="The Stackable image for Apache Druid"
 LABEL description="${DESCRIPTION}"
 
 # https://github.com/opencontainers/image-spec/blob/036563a4a268d7c08b51a08f05a02a0fe74c7268/annotations.md#annotations
 LABEL org.opencontainers.image.documentation="https://docs.stackable.tech/home/stable/druid/"
-LABEL org.opencontainers.image.version="${PRODUCT}"
-LABEL org.opencontainers.image.revision="${RELEASE}"
+LABEL org.opencontainers.image.version="${PRODUCT_VERSION}"
+LABEL org.opencontainers.image.revision="${RELEASE_VERSION}"
 LABEL org.opencontainers.image.title="${NAME}"
 LABEL org.opencontainers.image.description="${DESCRIPTION}"
 
@@ -136,8 +136,8 @@ LABEL io.k8s.description="${DESCRIPTION}"
 LABEL io.k8s.display-name="${NAME}"
 
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=druid-builder /stackable/apache-druid-${PRODUCT}-stackable${RELEASE} /stackable/apache-druid-${PRODUCT}-stackable${RELEASE}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=druid-builder /stackable/druid-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=druid-builder /stackable/apache-druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/apache-druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=druid-builder /stackable/druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/bin /stackable/bin
 COPY --chown=${STACKABLE_USER_UID}:0 druid/licenses /licenses
@@ -145,12 +145,12 @@ COPY --chown=${STACKABLE_USER_UID}:0 druid/licenses /licenses
 RUN <<EOF
 microdnf update
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-ln -sf /stackable/apache-druid-${PRODUCT}-stackable${RELEASE} /stackable/druid
+ln -sf /stackable/apache-druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/druid
 chown -h ${STACKABLE_USER_UID}:0 stackable/druid
 
 # Force to overwrite the existing 'run-druid'
@@ -159,7 +159,7 @@ chown -h ${STACKABLE_USER_UID}:0 /stackable/druid/bin/run-druid
 
 # fix missing permissions
 chmod -R g=u /stackable/bin
-chmod g=u /stackable/apache-druid-${PRODUCT}-stackable${RELEASE} /stackable/druid-${PRODUCT}-stackable${RELEASE}-src.tar.gz
+chmod g=u /stackable/apache-druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/druid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz
 EOF
 
 # ----------------------------------------
diff --git a/druid/boil-config.toml b/druid/boil-config.toml
new file mode 100644
index 000000000..8a30bc28e
--- /dev/null
+++ b/druid/boil-config.toml
@@ -0,0 +1,26 @@
+[versions."30.0.1".local-images]
+# https://druid.apache.org/docs/30.0.1/operations/java/
+java-base = "17"
+java-devel = "17"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."30.0.1".build-arguments]
+authorizer-version = "0.7.0"
+
+[versions."31.0.1".local-images]
+# https://druid.apache.org/docs/31.0.1/operations/java/
+java-base = "17"
+java-devel = "17"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."31.0.1".build-arguments]
+authorizer-version = "0.7.0"
+
+[versions."33.0.0".local-images]
+# https://druid.apache.org/docs/33.0.0/operations/java/
+java-base = "17"
+java-devel = "17"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."33.0.0".build-arguments]
+authorizer-version = "0.7.0"
diff --git a/druid/versions.py b/druid/versions.py
deleted file mode 100644
index e380f7c81..000000000
--- a/druid/versions.py
+++ /dev/null
@@ -1,26 +0,0 @@
-versions = [
-    {
-        "product": "30.0.1",
-        # https://druid.apache.org/docs/30.0.1/operations/java/
-        "java-base": "17",
-        "java-devel": "17",
-        "hadoop/hadoop": "3.3.6",
-        "authorizer": "0.7.0",
-    },
-    {
-        "product": "31.0.1",
-        # https://druid.apache.org/docs/31.0.1/operations/java/
-        "java-base": "17",
-        "java-devel": "17",
-        "hadoop/hadoop": "3.3.6",
-        "authorizer": "0.7.0",
-    },
-    {
-        "product": "33.0.0",
-        # https://druid.apache.org/docs/33.0.0/operations/java/
-        "java-base": "17",
-        "java-devel": "17",
-        "hadoop/hadoop": "3.3.6",
-        "authorizer": "0.7.0",
-    },
-]
diff --git a/hadoop/Dockerfile b/hadoop/Dockerfile
index 5ca3cd6b1..5a8892fc3 100644
--- a/hadoop/Dockerfile
+++ b/hadoop/Dockerfile
@@ -1,19 +1,19 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/java-devel AS hdfs-utils-builder
+FROM local-image/java-devel AS hdfs-utils-builder
 
-ARG HDFS_UTILS
-ARG PRODUCT
-ARG RELEASE
+ARG HDFS_UTILS_VERSION
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
-ARG HADOOP_HADOOP
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-# It is passed as `HADOOP_HADOOP`, because versions.py has to contain `hadoop/hadoop` to establish a dependency on the Hadoop builder.
-# The value of `hadoop/hadoop` is transformed by `bake` and automatically passed as `HADOOP_HADOOP` arg.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
+# It is passed as `HADOOP_HADOOP_VERSION`, because versions.py has to contain `hadoop/hadoop` to establish a dependency on the Hadoop builder.
+# The value of `hadoop/hadoop` is transformed by `bake` and automatically passed as `HADOOP_HADOOP_VERSION` arg.
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
 
 # Starting with hdfs-utils 0.4.0 we need to use Java 17 for compilation.
 # We can not simply use java-devel with Java 17, as it is also used to compile Hadoop in this
@@ -33,7 +33,7 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hdfs-utils/stackable/patches/patchable.toml /stackable/src/hadoop/hdfs-utils/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hdfs-utils/stackable/patches/${HDFS_UTILS} /stackable/src/hadoop/hdfs-utils/stackable/patches/${HDFS_UTILS}
+COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hdfs-utils/stackable/patches/${HDFS_UTILS_VERSION} /stackable/src/hadoop/hdfs-utils/stackable/patches/${HDFS_UTILS_VERSION}
 
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs /stackable/patched-libs
 
@@ -42,40 +42,40 @@ COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-li
 # labels to build a rackID from.
 # Starting with hdfs-utils version 0.3.0 the topology provider is not a standalone jar anymore and included in hdfs-utils.
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout hadoop/hdfs-utils ${HDFS_UTILS})"
+cd "$(/stackable/patchable --images-repo-root=src checkout hadoop/hdfs-utils ${HDFS_UTILS_VERSION})"
 
 # Make Maven aware of custom Stackable libraries
 mkdir -p /stackable/.m2/repository
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/hdfs-utils-${HDFS_UTILS}-src.tar.gz .
+tar -czf /stackable/hdfs-utils-${HDFS_UTILS_VERSION}-src.tar.gz .
 
 mvn \
     clean package \
     -P hadoop-${HADOOP_VERSION} \
-    -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE} \
+    -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
     -DskipTests \
     -Dmaven.javadoc.skip=true
 
-cp target/hdfs-utils-$HDFS_UTILS.jar /stackable/hdfs-utils-${HDFS_UTILS}.jar
+cp target/hdfs-utils-$HDFS_UTILS_VERSION.jar /stackable/hdfs-utils-${HDFS_UTILS_VERSION}.jar
 rm -rf hdfs-utils-main
 
 # Set correct groups
-chmod g=u /stackable/hdfs-utils-${HDFS_UTILS}.jar /stackable/hdfs-utils-${HDFS_UTILS}-src.tar.gz
+chmod g=u /stackable/hdfs-utils-${HDFS_UTILS_VERSION}.jar /stackable/hdfs-utils-${HDFS_UTILS_VERSION}-src.tar.gz
 EOF
 
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
-ARG RELEASE
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG HDFS_UTILS
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG HDFS_UTILS_VERSION
 ARG STACKABLE_USER_UID
-ARG ASYNC_PROFILER
-ARG JMX_EXPORTER
+ARG ASYNC_PROFILER_VERSION
+ARG JMX_EXPORTER_VERSION
 ARG TARGETARCH
 ARG TARGETOS
 
@@ -83,16 +83,16 @@ LABEL \
     name="Apache Hadoop" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Apache Hadoop." \
     description="This image is deployed by the Stackable Operator for Apache Hadoop / HDFS."
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/*-src.tar.gz /stackable
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS}.jar /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS}.jar
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS_VERSION}.jar /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/common/lib/hdfs-utils-${HDFS_UTILS_VERSION}.jar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hdfs-utils-builder /stackable/hdfs-utils-${HDFS_UTILS_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/stackable/jmx /stackable/jmx
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/licenses /licenses
@@ -110,7 +110,7 @@ microdnf install \
   fuse-libs \
   tar
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
@@ -119,21 +119,21 @@ rm -rf /var/cache/yum
 # It is so non-root users (as we are) can mount a FUSE device and let other users access it
 echo "user_allow_other" > /etc/fuse.conf
 
-ln -s "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}" /stackable/hadoop
+ln -s "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}" /stackable/hadoop
 
 # async-profiler
 ARCH="${TARGETARCH/amd64/x64}"
-curl "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC /stackable
-ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
+curl "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC /stackable
+ln -s "/stackable/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}" /stackable/async-profiler
 
 # JMX Exporter
-curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-chmod -x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
+curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+chmod -x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
 
 # Set correct permissions and ownerships
-chown --recursive ${STACKABLE_USER_UID}:0 /stackable/hadoop /stackable/jmx /stackable/async-profiler "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}"
-chmod --recursive g=u /stackable/jmx /stackable/async-profiler "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}"
+chown --recursive ${STACKABLE_USER_UID}:0 /stackable/hadoop /stackable/jmx /stackable/async-profiler "/stackable/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}"
+chmod --recursive g=u /stackable/jmx /stackable/async-profiler "/stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}"
 
 # Workaround for https://issues.apache.org/jira/browse/HADOOP-12845
 # The problem is that our stackable-devel image does contain the openssl-devel package
diff --git a/hadoop/boil-config.toml b/hadoop/boil-config.toml
new file mode 100644
index 000000000..6636ae943
--- /dev/null
+++ b/hadoop/boil-config.toml
@@ -0,0 +1,20 @@
+# Not part of SDP 25.7.0, but still required for hbase, hive, spark-k8s
+[versions."3.3.6".local-images]
+"hadoop/hadoop" = "3.3.6"
+java-base = "11"
+java-devel = "11"
+
+[versions."3.3.6".build-arguments]
+async-profiler-version = "2.9"
+jmx-exporter-version = "1.3.0"
+hdfs-utils-version = "0.4.0"
+
+[versions."3.4.1".local-images]
+"hadoop/hadoop" = "3.4.1"
+java-base = "11"
+java-devel = "11"
+
+[versions."3.4.1".build-arguments]
+async-profiler-version = "2.9"
+jmx-exporter-version = "1.3.0"
+hdfs-utils-version = "0.4.1"
diff --git a/hadoop/hadoop/Dockerfile b/hadoop/hadoop/Dockerfile
index 342eef556..a17feec73 100644
--- a/hadoop/hadoop/Dockerfile
+++ b/hadoop/hadoop/Dockerfile
@@ -1,17 +1,17 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-devel AS hadoop-builder
+FROM local-image/java-devel AS hadoop-builder
 
-ARG PRODUCT
-ARG RELEASE
-ARG PROTOBUF
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG PROTOBUF_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 shared/protobuf/stackable/patches/patchable.toml /stackable/src/shared/protobuf/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 shared/protobuf/stackable/patches/${PROTOBUF} /stackable/src/shared/protobuf/stackable/patches/${PROTOBUF}
+COPY --chown=${STACKABLE_USER_UID}:0 shared/protobuf/stackable/patches/${PROTOBUF_VERSION} /stackable/src/shared/protobuf/stackable/patches/${PROTOBUF_VERSION}
 
 RUN <<EOF
 rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
@@ -30,16 +30,16 @@ USER ${STACKABLE_USER_UID}
 # See https://github.com/apache/hadoop/blob/trunk/dev-support/docker/pkg-resolver/install-protobuf.sh
 # (this was hardcoded in the Dockerfile in earlier versions of Hadoop, make sure to look at the exact version in Github)
 RUN <<EOF
-    cd "$(/stackable/patchable --images-repo-root=src checkout shared/protobuf ${PROTOBUF})"
+    cd "$(/stackable/patchable --images-repo-root=src checkout shared/protobuf ${PROTOBUF_VERSION})"
 
     # Create snapshot of the source code including custom patches
-    tar -czf /stackable/protobuf-${PROTOBUF}-src.tar.gz .
+    tar -czf /stackable/protobuf-${PROTOBUF_VERSION}-src.tar.gz .
 
     ./autogen.sh
     ./configure --prefix=/opt/protobuf
     make "-j$(nproc)"
     make install
-    (cd .. && rm -r ${PROTOBUF})
+    (cd .. && rm -r ${PROTOBUF_VERSION})
 EOF
 
 ENV PROTOBUF_HOME=/opt/protobuf
@@ -47,7 +47,7 @@ ENV PATH="${PATH}:/opt/protobuf/bin"
 
 WORKDIR /build
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hadoop/stackable/patches/patchable.toml /build/src/hadoop/hadoop/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hadoop/stackable/patches/${PRODUCT} /build/src/hadoop/hadoop/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hadoop/stackable/patches/${PRODUCT_VERSION} /build/src/hadoop/hadoop/stackable/patches/${PRODUCT_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 hadoop/hadoop/stackable/fuse_dfs_wrapper /build
 USER ${STACKABLE_USER_UID}
 # Hadoop Pipes requires libtirpc to build, whose headers are not packaged in RedHat UBI, so skip building this module
@@ -56,10 +56,10 @@ USER ${STACKABLE_USER_UID}
 # jar files will be stripped if they are needed elsewhere e.g. share/hadoop/yarn will not be part of the build, but yarn jars
 # will still exist in share/hadoop/tools as they would be needed by the resource estimator tool. Such jars are removed in a later step.
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout hadoop/hadoop ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout hadoop/hadoop ${PRODUCT_VERSION})"
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION=${PRODUCT}-stackable${RELEASE}
+NEW_VERSION=${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 
 mvn versions:set -DnewVersion=${NEW_VERSION}
 
@@ -101,7 +101,7 @@ mv hadoop-dist/target/bom.json /stackable/hadoop-${NEW_VERSION}/hadoop-${NEW_VER
 cp hadoop-hdfs-project/hadoop-hdfs-native-client/target/main/native/fuse-dfs/fuse_dfs /stackable/hadoop-${NEW_VERSION}/bin
 
 # Remove source code
-(cd .. && rm -r ${PRODUCT})
+(cd .. && rm -r ${PRODUCT_VERSION})
 
 ln -s /stackable/hadoop-${NEW_VERSION} /stackable/hadoop
 
diff --git a/hadoop/hadoop/boil-config.toml b/hadoop/hadoop/boil-config.toml
new file mode 100644
index 000000000..c8f4e5140
--- /dev/null
+++ b/hadoop/hadoop/boil-config.toml
@@ -0,0 +1,11 @@
+[versions."3.3.6".local-images]
+java-devel = "11"
+
+[versions."3.3.6".build-arguments]
+protobuf-version = "3.7.1"
+
+[versions."3.4.1".local-images]
+java-devel = "11"
+
+[versions."3.4.1".build-arguments]
+protobuf-version = "3.7.1"
diff --git a/hadoop/hadoop/versions.py b/hadoop/hadoop/versions.py
deleted file mode 100644
index d6907a86f..000000000
--- a/hadoop/hadoop/versions.py
+++ /dev/null
@@ -1,13 +0,0 @@
-versions = [
-    {
-        # Not part of SDP 25.7.0, but still required for hbase, hive, spark-k8s
-        "product": "3.3.6",
-        "java-devel": "11",
-        "protobuf": "3.7.1",
-    },
-    {
-        "product": "3.4.1",
-        "java-devel": "11",
-        "protobuf": "3.7.1",
-    },
-]
diff --git a/hadoop/versions.py b/hadoop/versions.py
deleted file mode 100644
index e88be1aca..000000000
--- a/hadoop/versions.py
+++ /dev/null
@@ -1,21 +0,0 @@
-versions = [
-    {
-        # Not part of SDP 25.7.0, but still required for hbase, hive, spark-k8s
-        "product": "3.3.6",
-        "hadoop/hadoop": "3.3.6",
-        "java-base": "11",
-        "java-devel": "11",
-        "async_profiler": "2.9",
-        "jmx_exporter": "1.3.0",
-        "hdfs_utils": "0.4.0",
-    },
-    {
-        "product": "3.4.1",
-        "hadoop/hadoop": "3.4.1",
-        "java-base": "11",
-        "java-devel": "11",
-        "async_profiler": "2.9",
-        "jmx_exporter": "1.3.0",
-        "hdfs_utils": "0.4.1",
-    },
-]
diff --git a/hbase/Dockerfile b/hbase/Dockerfile
index e7a97557d..ab41ba14a 100644
--- a/hbase/Dockerfile
+++ b/hbase/Dockerfile
@@ -1,30 +1,30 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/hbase/hbase AS hbase-builder
+FROM local-image/hbase/hbase AS hbase-builder
 
-FROM stackable/image/hbase/phoenix AS phoenix
+FROM local-image/hbase/phoenix AS phoenix
 
-FROM stackable/image/hbase/hbase-operator-tools AS hbase-operator-tools
+FROM local-image/hbase/hbase-operator-tools AS hbase-operator-tools
 
-FROM stackable/image/hbase/hbase-opa-authorizer AS hbase-opa-authorizer
+FROM local-image/hbase/hbase-opa-authorizer AS hbase-opa-authorizer
 
 # Splitting this out into its own builder so that Hadoop & HBase can be built in parallel
 # envsubst is only available in java-devel which is why we don't just do this in the final image
-FROM stackable/image/java-devel AS hadoop-s3-builder
+FROM local-image/java-devel AS hadoop-s3-builder
 
-ARG PRODUCT
-ARG RELEASE
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG HBASE_HBASE
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG HBASE_HBASE_VERSION
 # Reassign the arg to `HBASE_VERSION` for better readability.
-# It is passed as `HBASE_HBASE`, because versions.py has to contain `hbase/hbase` to establish a dependency on the HBase builder.
-# The value of `hbase/hbase` is transformed by `bake` and automatically passed as `HBASE_HBASE` arg.
-ENV HBASE_VERSION=${HBASE_HBASE}
+# It is passed as `HBASE_HBASE_VERSION`, because versions.py has to contain `hbase/hbase` to establish a dependency on the HBase builder.
+# The value of `hbase/hbase` is transformed by `bake` and automatically passed as `HBASE_HBASE_VERSION` arg.
+ENV HBASE_VERSION=${HBASE_HBASE_VERSION}
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
@@ -37,7 +37,7 @@ COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 \
   # So we try to copy both and if one of them doesn't exist buildx will just ignore it :)
   /stackable/hadoop/share/hadoop/tools/lib/bundle-*.jar \
   /stackable/hadoop/share/hadoop/tools/lib/aws-java-sdk-bundle-*.jar \
-  /stackable/hadoop/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE}.jar \
+  /stackable/hadoop/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar \
   /stackable/hadoop/share/hadoop/tools/lib/
 
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/export-snapshot-to-s3.env /stackable/bin/
@@ -49,7 +49,7 @@ export LIBS=$(find /stackable/hadoop/share/hadoop -name '*.jar' -printf '%p:' |
 # The variable names are intentionally passed to envsubst in single-quotes,
 # so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
 # does not work, so please ignore the according warning (SC2016).
-envsubst '${HBASE_VERSION}:${RELEASE}:${LIBS}' < /stackable/bin/export-snapshot-to-s3.env > /stackable/bin/export-snapshot-to-s3
+envsubst '${HBASE_VERSION}:${RELEASE_VERSION}:${LIBS}' < /stackable/bin/export-snapshot-to-s3.env > /stackable/bin/export-snapshot-to-s3
 chmod +x /stackable/bin/export-snapshot-to-s3
 rm /stackable/bin/export-snapshot-to-s3.env
 
@@ -58,35 +58,35 @@ chmod --recursive g=u /stackable
 EOF
 
 # Final Image
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
-ARG RELEASE
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
 ARG HBASE_PROFILE
-ARG HBASE_HBASE
+ARG HBASE_HBASE_VERSION
 # Reassign the arg to `HBASE_VERSION` for better readability.
-ENV HBASE_VERSION=${HBASE_HBASE}
-ARG HBASE_HBASE_OPERATOR_TOOLS
-ARG HBASE_HBASE_OPA_AUTHORIZER
-ARG HBASE_PHOENIX
+ENV HBASE_VERSION=${HBASE_HBASE_VERSION}
+ARG HBASE_HBASE_OPERATOR_TOOLS_VERSION
+ARG HBASE_HBASE_OPA_AUTHORIZER_VERSION
+ARG HBASE_PHOENIX_VERSION
 ARG STACKABLE_USER_UID
 
 ARG NAME="Apache HBase"
 ARG DESCRIPTION="This image is deployed by the Stackable Operator for Apache HBase"
 
 LABEL name="${NAME}"
-LABEL version="${PRODUCT}"
-LABEL release="${RELEASE}"
+LABEL version="${PRODUCT_VERSION}"
+LABEL release="${RELEASE_VERSION}"
 LABEL summary="The Stackable image for Apache HBase"
 LABEL description="${DESCRIPTION}"
 
 # https://github.com/opencontainers/image-spec/blob/036563a4a268d7c08b51a08f05a02a0fe74c7268/annotations.md#annotations
 LABEL org.opencontainers.image.documentation="https://docs.stackable.tech/home/stable/hbase/"
-LABEL org.opencontainers.image.version="${PRODUCT}"
-LABEL org.opencontainers.image.revision="${RELEASE}"
+LABEL org.opencontainers.image.version="${PRODUCT_VERSION}"
+LABEL org.opencontainers.image.revision="${RELEASE_VERSION}"
 LABEL org.opencontainers.image.title="${NAME}"
 LABEL org.opencontainers.image.description="${DESCRIPTION}"
 
@@ -96,17 +96,17 @@ LABEL io.openshift.tags="ubi9,stackable,hbase,sdp,nosql"
 LABEL io.k8s.description="${DESCRIPTION}"
 LABEL io.k8s.display-name="${NAME}"
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE} /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION} /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-builder /stackable/async-profiler /stackable/async-profiler/
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}-stackable${RELEASE} /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}-stackable${RELEASE}/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE_VERSION} /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE_VERSION}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/bin/hbck2 /stackable/bin/hbck2
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/bin/hbase-entrypoint.sh /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}/bin/hbase-entrypoint.sh
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-operator-tools /stackable/bin/hbase-entrypoint.sh /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}/bin/hbase-entrypoint.sh
 
 COPY --chown=${STACKABLE_USER_UID}:0 --from=phoenix /stackable/phoenix /stackable/phoenix/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=phoenix /stackable/phoenix-${HBASE_PHOENIX}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=phoenix /stackable/phoenix-${HBASE_PHOENIX_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-s3-builder /stackable/bin/export-snapshot-to-s3 /stackable/bin/export-snapshot-to-s3
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-s3-builder /stackable/hadoop/share/hadoop/tools/lib/ /stackable/hadoop/share/hadoop/tools/lib/
@@ -116,11 +116,11 @@ COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-s3-builder /stackable/hadoop/
 # hadoop-azure-${HADOOP}.jar contains the AzureBlobFileSystem which is required
 # by hadoop-common-${HADOOP}.jar if the scheme of a file system is "abfs://".
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder \
-  /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE}.jar \
-  /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}/lib/
+  /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar \
+  /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}/lib/
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-opa-authorizer /stackable/hbase-opa-authorizer-${HBASE_HBASE_OPA_AUTHORIZER}-src.tar.gz /stackable
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-opa-authorizer /stackable/hbase-opa-authorizer/target/hbase-opa-authorizer*.jar /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}/lib
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-opa-authorizer /stackable/hbase-opa-authorizer-${HBASE_HBASE_OPA_AUTHORIZER_VERSION}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-opa-authorizer /stackable/hbase-opa-authorizer/target/hbase-opa-authorizer*.jar /stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}/lib
 
 RUN <<EOF
 microdnf update
@@ -135,16 +135,16 @@ microdnf install \
   zip
 
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-ln --symbolic --logical --verbose "/stackable/hbase-${HBASE_VERSION}-stackable${RELEASE}" /stackable/hbase
+ln --symbolic --logical --verbose "/stackable/hbase-${HBASE_VERSION}-stackable${RELEASE_VERSION}" /stackable/hbase
 chown --no-dereference ${STACKABLE_USER_UID}:0 /stackable/hbase
 chmod g=u /stackable/hbase
 
-ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS}-stackable${RELEASE}" /stackable/hbase-operator-tools
+ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE_VERSION}" /stackable/hbase-operator-tools
 chown --no-dereference ${STACKABLE_USER_UID}:0 /stackable/hbase-operator-tools
 chmod g=u /stackable/hbase-operator-tools
 
diff --git a/hbase/boil-config.toml b/hbase/boil-config.toml
new file mode 100644
index 000000000..2aa8bd793
--- /dev/null
+++ b/hbase/boil-config.toml
@@ -0,0 +1,25 @@
+[versions."2.6.1".local-images]
+"hbase/hbase" = "2.6.1"
+"hbase/hbase-operator-tools" = "1.3.0-fd5a5fb-hbase2.6.1"
+"hbase/phoenix" = "5.2.1-hbase2.6.1"
+"hbase/hbase-opa-authorizer" = "0.1.0" # only for HBase 2.6.1
+"hadoop/hadoop" = "3.3.6"
+java-base = "11"
+java-devel = "11"
+
+[versions."2.6.1".build-arguments]
+hbase-profile = "2.6"
+delete-caches = "true"
+
+[versions."2.6.2".local-images]
+"hbase/hbase" = "2.6.2"
+"hbase/hbase-operator-tools" = "1.3.0-fd5a5fb-hbase2.6.2"
+"hbase/phoenix" = "5.2.1-hbase2.6.2"
+"hbase/hbase-opa-authorizer" = "0.1.0" # only for HBase 2.6.1
+"hadoop/hadoop" = "3.4.1"
+java-base = "11"
+java-devel = "11"
+
+[versions."2.6.2".build-arguments]
+hbase-profile = "2.6"
+delete-caches = "true"
diff --git a/hbase/hbase-opa-authorizer/Dockerfile b/hbase/hbase-opa-authorizer/Dockerfile
index 78f5a7115..c43e4990a 100644
--- a/hbase/hbase-opa-authorizer/Dockerfile
+++ b/hbase/hbase-opa-authorizer/Dockerfile
@@ -1,6 +1,6 @@
-FROM stackable/image/java-devel
+FROM local-image/java-devel
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG DELETE_CACHES
 ARG STACKABLE_USER_UID
 
@@ -8,17 +8,17 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-opa-authorizer/stackable/patches/patchable.toml /stackable/src/hbase/hbase-opa-authorizer/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-opa-authorizer/stackable/patches/${PRODUCT} /stackable/src/hbase/hbase-opa-authorizer/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-opa-authorizer/stackable/patches/${PRODUCT_VERSION} /stackable/src/hbase/hbase-opa-authorizer/stackable/patches/${PRODUCT_VERSION}
 
 RUN --mount=type=cache,id=maven-opa,uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
 ###
 ### OPA Authorizer (only for 2.6 upwards)
 ###
-if [[ -n "$PRODUCT" ]]; then
-    cd "$(/stackable/patchable --images-repo-root=src checkout hbase/hbase-opa-authorizer ${PRODUCT})"
+if [[ -n "$PRODUCT_VERSION" ]]; then
+    cd "$(/stackable/patchable --images-repo-root=src checkout hbase/hbase-opa-authorizer ${PRODUCT_VERSION})"
 
     # Create snapshot of the source code including custom patches
-    tar -czf /stackable/hbase-opa-authorizer-${PRODUCT}-src.tar.gz .
+    tar -czf /stackable/hbase-opa-authorizer-${PRODUCT_VERSION}-src.tar.gz .
     mvn \
       -DskipTests \
       -Dmaven.test.skip=true \
@@ -27,7 +27,7 @@ else
   # Create a dummy jar to avoid errors when copying it to the final image
   mkdir -p target
   touch target/hbase-opa-authorizer.jar
-  touch /stackable/hbase-opa-authorizer-${PRODUCT}-src.tar.gz
+  touch /stackable/hbase-opa-authorizer-${PRODUCT_VERSION}-src.tar.gz
 fi
 
 mkdir /stackable/hbase-opa-authorizer
diff --git a/hbase/hbase-opa-authorizer/boil-config.toml b/hbase/hbase-opa-authorizer/boil-config.toml
new file mode 100644
index 000000000..6e2beba1b
--- /dev/null
+++ b/hbase/hbase-opa-authorizer/boil-config.toml
@@ -0,0 +1,5 @@
+[versions."0.1.0".local-images]
+java-devel = "11"
+
+[versions."0.1.0".build-arguments]
+delete-caches = "true"
diff --git a/hbase/hbase-opa-authorizer/versions.py b/hbase/hbase-opa-authorizer/versions.py
deleted file mode 100644
index cd1f2934f..000000000
--- a/hbase/hbase-opa-authorizer/versions.py
+++ /dev/null
@@ -1,7 +0,0 @@
-versions = [
-    {
-        "product": "0.1.0",
-        "java-devel": "11",
-        "delete_caches": "true",
-    },
-]
diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile
index 26ce48f69..c708db176 100644
--- a/hbase/hbase-operator-tools/Dockerfile
+++ b/hbase/hbase-operator-tools/Dockerfile
@@ -1,15 +1,15 @@
-FROM stackable/image/hbase/hbase AS hbase-builder
+FROM local-image/hbase/hbase AS hbase-builder
 
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/java-devel
+FROM local-image/java-devel
 
-ARG PRODUCT
-ARG RELEASE
-ARG HBASE_THIRDPARTY
-ARG HBASE_HBASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HBASE_THIRDPARTY_VERSION
+ARG HBASE_HBASE_VERSION
 # Reassign the arg to `HBASE_VERSION` for better readability.
-ENV HBASE_VERSION=${HBASE_HBASE}
+ENV HBASE_VERSION=${HBASE_HBASE_VERSION}
 ARG STACKABLE_USER_UID
 ARG HBASE_OPERATOR_TOOLS_VERSION
 
@@ -34,16 +34,16 @@ WORKDIR /stackable
 
 # Cache mounts are owned by root by default
 # We need to explicitly give the uid to use
-RUN --mount=type=cache,id=maven-hbase-operator-tools-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-hbase-operator-tools-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
 cd "$(/stackable/patchable --images-repo-root=src checkout hbase/hbase-operator-tools ${HBASE_OPERATOR_TOOLS_VERSION})"
 
 # Make Maven aware of custom Stackable libraries
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE}"
-FULL_HBASE_OPERATOR_TOOLS_VERSION="${PRODUCT}-stackable${RELEASE}" # This includes the HBase version and the Stackable release suffix
-PATCHED_HBASE_VERSION="${HBASE_VERSION}-stackable${RELEASE}"
+NEW_VERSION="${HBASE_OPERATOR_TOOLS_VERSION}-stackable${RELEASE_VERSION}"
+FULL_HBASE_OPERATOR_TOOLS_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}" # This includes the HBase version and the Stackable release suffix
+PATCHED_HBASE_VERSION="${HBASE_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -52,7 +52,7 @@ tar -czf /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}-sr
 
 mvn \
   -Dhbase.version=${PATCHED_HBASE_VERSION} \
-  -Dhbase-thirdparty.version=${HBASE_THIRDPARTY} \
+  -Dhbase-thirdparty.version=${HBASE_THIRDPARTY_VERSION} \
   -DskipTests \
   -Dmaven.test.skip=true \
   package assembly:single
diff --git a/hbase/hbase-operator-tools/boil-config.toml b/hbase/hbase-operator-tools/boil-config.toml
new file mode 100644
index 000000000..92570b2a5
--- /dev/null
+++ b/hbase/hbase-operator-tools/boil-config.toml
@@ -0,0 +1,19 @@
+[versions."1.3.0-fd5a5fb-hbase2.6.1".local-images]
+"hadoop/hadoop" = "3.3.6"
+"hbase/hbase" = "2.6.1"
+"java-devel" = "11"
+
+[versions."1.3.0-fd5a5fb-hbase2.6.1".build-arguments]
+hbase-operator-tools-version = "1.3.0-fd5a5fb"
+hbase-thirdparty-version = "4.1.9"
+delete-caches = "true"
+
+[versions."1.3.0-fd5a5fb-hbase2.6.2".local-images]
+"hadoop/hadoop" = "3.4.1"
+"hbase/hbase" = "2.6.2"
+"java-devel" = "11"
+
+[versions."1.3.0-fd5a5fb-hbase2.6.2".build-arguments]
+hbase-operator-tools-version = "1.3.0-fd5a5fb"
+hbase-thirdparty-version = "4.1.9"
+delete-caches = "true"
diff --git a/hbase/hbase-operator-tools/versions.py b/hbase/hbase-operator-tools/versions.py
deleted file mode 100644
index 248ecd343..000000000
--- a/hbase/hbase-operator-tools/versions.py
+++ /dev/null
@@ -1,20 +0,0 @@
-versions = [
-    {
-        "product": "1.3.0-fd5a5fb-hbase2.6.1",
-        "hbase_operator_tools_version": "1.3.0-fd5a5fb",
-        "hadoop/hadoop": "3.3.6",
-        "hbase_thirdparty": "4.1.9",
-        "hbase/hbase": "2.6.1",
-        "java-devel": "11",
-        "delete_caches": "true",
-    },
-    {
-        "product": "1.3.0-fd5a5fb-hbase2.6.2",
-        "hbase_operator_tools_version": "1.3.0-fd5a5fb",
-        "hadoop/hadoop": "3.4.1",
-        "hbase_thirdparty": "4.1.9",
-        "hbase/hbase": "2.6.2",
-        "java-devel": "11",
-        "delete_caches": "true",
-    },
-]
diff --git a/hbase/hbase/Dockerfile b/hbase/hbase/Dockerfile
index 63dbdef99..84ed95311 100644
--- a/hbase/hbase/Dockerfile
+++ b/hbase/hbase/Dockerfile
@@ -1,13 +1,13 @@
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/java-devel AS hbase-builder
+FROM local-image/java-devel AS hbase-builder
 
-ARG PRODUCT
-ARG RELEASE
-ARG ASYNC_PROFILER
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG ASYNC_PROFILER_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
 ARG TARGETARCH
 ARG TARGETOS
 ARG STACKABLE_USER_UID
@@ -22,7 +22,7 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/patches/patchable.toml /stackable/src/hbase/hbase/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/patches/${PRODUCT} /stackable/src/hbase/hbase/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/patches/${PRODUCT_VERSION} /stackable/src/hbase/hbase/stackable/patches/${PRODUCT_VERSION}
 
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs /stackable/patched-libs
 # Cache mounts are owned by root by default
@@ -36,14 +36,14 @@ COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-li
 # builder containers will share the same cache and the `rm -rf` commands will fail
 # with a "directory not empty" error on the first builder to finish, as other builders
 # are still working in the cache directory.
-RUN --mount=type=cache,id=maven-hbase-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout hbase/hbase ${PRODUCT})"
+RUN --mount=type=cache,id=maven-hbase-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+cd "$(/stackable/patchable --images-repo-root=src checkout hbase/hbase ${PRODUCT_VERSION})"
 
 # Make Maven aware of custom Stackable libraries
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -55,13 +55,13 @@ tar -czf /stackable/hbase-${NEW_VERSION}-src.tar.gz .
 # Cannot skip building tests here because the assembly plugin needs a shell script from the test directory.
 mvn \
   -Dhadoop.profile=3.0 \
-  -Dhadoop-three.version=${HADOOP_VERSION}-stackable${RELEASE} \
+  -Dhadoop-three.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
   -DskipTests \
   clean install
 
 mvn \
   -Dhadoop.profile=3.0 \
-  -Dhadoop-three.version=${HADOOP_VERSION}-stackable${RELEASE} \
+  -Dhadoop-three.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
   -DskipTests \
   -Dcheckstyle.skip=true \
   -Prelease \
@@ -72,7 +72,7 @@ sed -i "s/${NEW_VERSION}/${ORIGINAL_VERSION}/g" hbase-assembly/target/bom.json
 mv hbase-assembly/target/bom.json /stackable/hbase-${NEW_VERSION}/hbase-${NEW_VERSION}.cdx.json
 
 # Remove sources
-(cd .. && rm -r ${PRODUCT})
+(cd .. && rm -r ${PRODUCT_VERSION})
 
 ln -s "/stackable/hbase-${NEW_VERSION}" /stackable/hbase
 
@@ -84,8 +84,8 @@ cp -r /stackable/.m2/repository/org/apache/hbase /stackable/patched-libs/maven/o
 ###
 cd /stackable
 export ARCH="${TARGETARCH/amd64/x64}"
-curl --fail "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC .
-ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
+curl --fail "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}.tar.gz"  | tar -xzC .
+ln -s "/stackable/async-profiler-${ASYNC_PROFILER_VERSION}-${TARGETOS}-${ARCH}" /stackable/async-profiler
 
 # We're removing these to make the intermediate layer smaller
 # This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
diff --git a/hbase/hbase/boil-config.toml b/hbase/hbase/boil-config.toml
new file mode 100644
index 000000000..289cdfb13
--- /dev/null
+++ b/hbase/hbase/boil-config.toml
@@ -0,0 +1,17 @@
+[versions."2.6.1".local-images]
+"hadoop/hadoop" = "3.3.6"
+java-base = "11"
+java-devel = "11"
+
+[versions."2.6.1".build-arguments]
+async-profiler-version = "2.9"
+delete-caches = "true"
+
+[versions."2.6.2".local-images]
+"hadoop/hadoop" = "3.4.1"
+java-base = "11"
+java-devel = "11"
+
+[versions."2.6.2".build-arguments]
+async-profiler-version = "2.9"
+delete-caches = "true"
diff --git a/hbase/hbase/versions.py b/hbase/hbase/versions.py
deleted file mode 100644
index 205cedacb..000000000
--- a/hbase/hbase/versions.py
+++ /dev/null
@@ -1,20 +0,0 @@
-versions = [
-    # Also do not merge java-base with java below as "JAVA-BASE is not a valid identifier" in Dockerfiles, it's unfortunate but to fix this would require a bigger refactoring of names or the image tools
-    # hbase-thirdparty is used to build the hbase-operator-tools and should be set to the version defined in the POM of HBase.
-    {
-        "product": "2.6.1",
-        "hadoop/hadoop": "3.3.6",
-        "java-base": "11",
-        "java-devel": "11",
-        "async_profiler": "2.9",
-        "delete_caches": "true",
-    },
-    {
-        "product": "2.6.2",
-        "hadoop/hadoop": "3.4.1",
-        "java-base": "11",
-        "java-devel": "11",
-        "async_profiler": "2.9",
-        "delete_caches": "true",
-    },
-]
diff --git a/hbase/phoenix/Dockerfile b/hbase/phoenix/Dockerfile
index 4cad25c75..468f5a43c 100644
--- a/hbase/phoenix/Dockerfile
+++ b/hbase/phoenix/Dockerfile
@@ -1,19 +1,18 @@
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/hbase/hbase AS hbase-builder
+FROM local-image/hbase/hbase AS hbase-builder
 
-FROM stackable/image/java-devel
+FROM local-image/java-devel
 
-ARG PRODUCT
-ARG RELEASE
-ARG ASYNC_PROFILER
-ARG HBASE_HBASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HBASE_HBASE_VERSION
 # Reassign the arg to `HBASE_VERSION` for better readability.
-ENV HBASE_VERSION=${HBASE_HBASE}
+ENV HBASE_VERSION=${HBASE_HBASE_VERSION}
 ARG HBASE_PROFILE
-ARG HADOOP_HADOOP
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
 ARG STACKABLE_USER_UID
 ARG PHOENIX_VERSION
 
@@ -29,7 +28,7 @@ COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-li
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
-RUN --mount=type=cache,id=maven-phoenix-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-phoenix-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
 
 # Make Maven aware of custom Stackable libraries
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
@@ -37,19 +36,19 @@ cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 cd "$(/stackable/patchable --images-repo-root=src checkout phoenix ${PHOENIX_VERSION})"
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${PHOENIX_VERSION}-stackable${RELEASE}"
+NEW_VERSION="${PHOENIX_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/phoenix-${PRODUCT}-stackable${RELEASE}-src.tar.gz .
+tar -czf /stackable/phoenix-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
 
 # The Maven command can be found inside of the scripts in the create-release folder (release-util.sh as of Phoenix 5.2.0)
 # https://github.com/apache/phoenix/tree/5.2.0/dev/create-release
 mvn \
-  -Dhbase.version=${HBASE_VERSION}-stackable${RELEASE} \
+  -Dhbase.version=${HBASE_VERSION}-stackable${RELEASE_VERSION} \
   -Dhbase.profile=${HBASE_PROFILE} \
-  -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE} \
+  -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION} \
   -DskipTests \
   -Dcheckstyle.skip=true \
   clean \
@@ -57,14 +56,14 @@ mvn \
 
 # We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
 # And we're stripping the top level directory while extracting because it may be called different than the folder name when it's a SNAPSHOT
-mkdir /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-stackable${RELEASE}-bin
-tar -xz -f phoenix-assembly/target/phoenix-hbase-*-bin.tar.gz -C /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-stackable${RELEASE}-bin/ --strip-components=1
+mkdir /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin
+tar -xz -f phoenix-assembly/target/phoenix-hbase-*-bin.tar.gz -C /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/ --strip-components=1
 sed -i "s/${NEW_VERSION}/${ORIGINAL_VERSION}/g" phoenix-assembly/target/bom.json
-mv phoenix-assembly/target/bom.json /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-stackable${RELEASE}-bin/phoenix-${HBASE_PROFILE}-${PRODUCT}-stackable${RELEASE}.cdx.json
+mv phoenix-assembly/target/bom.json /stackable/phoenix-${HBASE_PROFILE}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/phoenix-${HBASE_PROFILE}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 
 # Remove sources
 (cd .. && rm -r ${PHOENIX_VERSION})
-ln -s "/stackable/phoenix-${HBASE_PROFILE}-${PRODUCT}-stackable${RELEASE}-bin" /stackable/phoenix
+ln -s "/stackable/phoenix-${HBASE_PROFILE}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin" /stackable/phoenix
 
 # We're removing these to make the intermediate layer smaller
 # This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
diff --git a/hbase/phoenix/boil-config.toml b/hbase/phoenix/boil-config.toml
new file mode 100644
index 000000000..8425f970a
--- /dev/null
+++ b/hbase/phoenix/boil-config.toml
@@ -0,0 +1,19 @@
+[versions."5.2.1-hbase2.6.1".local-images]
+"hbase/hbase" = "2.6.1"
+"hadoop/hadoop" = "3.3.6"
+java-devel = "11"
+
+[versions."5.2.1-hbase2.6.1".build-arguments]
+phoenix-version = "5.2.1"
+hbase-profile = "2.6"
+delete-caches = "true"
+
+[versions."5.2.1-hbase2.6.2".local-images]
+"hbase/hbase" = "2.6.2"
+"hadoop/hadoop" = "3.4.1"
+java-devel = "11"
+
+[versions."5.2.1-hbase2.6.2".build-arguments]
+phoenix-version = "5.2.1"
+hbase-profile = "2.6"
+delete-caches = "true"
diff --git a/hbase/phoenix/versions.py b/hbase/phoenix/versions.py
deleted file mode 100644
index ed0e304e2..000000000
--- a/hbase/phoenix/versions.py
+++ /dev/null
@@ -1,20 +0,0 @@
-versions = [
-    {
-        "product": "5.2.1-hbase2.6.1",
-        "phoenix_version": "5.2.1",
-        "hbase/hbase": "2.6.1",
-        "hadoop/hadoop": "3.3.6",
-        "java-devel": "11",
-        "hbase_profile": "2.6",
-        "delete_caches": "true",
-    },
-    {
-        "product": "5.2.1-hbase2.6.2",
-        "phoenix_version": "5.2.1",
-        "hbase/hbase": "2.6.2",
-        "hadoop/hadoop": "3.4.1",
-        "java-devel": "11",
-        "hbase_profile": "2.6",
-        "delete_caches": "true",
-    },
-]
diff --git a/hbase/versions.py b/hbase/versions.py
deleted file mode 100644
index 3ea6dcdbf..000000000
--- a/hbase/versions.py
+++ /dev/null
@@ -1,28 +0,0 @@
-versions = [
-    # Also do not merge java-base with java below as "JAVA-BASE is not a valid identifier" in Dockerfiles, it's unfortunate but to fix this would require a bigger refactoring of names or the image tools
-    # hbase-thirdparty is used to build the hbase-operator-tools and should be set to the version defined in the POM of HBase.
-    {
-        "product": "2.6.1",
-        "hbase/hbase": "2.6.1",
-        "hbase/hbase-operator-tools": "1.3.0-fd5a5fb-hbase2.6.1",
-        "hbase/phoenix": "5.2.1-hbase2.6.1",
-        "hbase/hbase-opa-authorizer": "0.1.0",  # only for HBase 2.6.1
-        "hadoop/hadoop": "3.3.6",
-        "java-base": "11",
-        "java-devel": "11",
-        "hbase_profile": "2.6",
-        "delete_caches": "true",
-    },
-    {
-        "product": "2.6.2",
-        "hbase/hbase": "2.6.2",
-        "hbase/hbase-operator-tools": "1.3.0-fd5a5fb-hbase2.6.2",
-        "hbase/phoenix": "5.2.1-hbase2.6.2",
-        "hbase/hbase-opa-authorizer": "0.1.0",  # only for HBase 2.6.1
-        "hadoop/hadoop": "3.4.1",
-        "java-base": "11",
-        "java-devel": "11",
-        "hbase_profile": "2.6",
-        "delete_caches": "true",
-    },
-]
diff --git a/hive/Dockerfile b/hive/Dockerfile
index f182975f0..2778dbc04 100644
--- a/hive/Dockerfile
+++ b/hive/Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
-FROM stackable/image/java-devel AS hive-builder
+FROM local-image/java-devel AS hive-builder
 
 
 # Apache Hive up to 4.0.x(!) officially requires Java 8 (there is no distinction between building and running).
@@ -11,15 +11,15 @@ FROM stackable/image/java-devel AS hive-builder
 # As we got weird TLS errors (https://stackable-workspace.slack.com/archives/C031A5BEFS7/p1713185172557459) with a
 # Java 8 runtime we bumped the Runtime to Java 11 again.
 
-ARG PRODUCT
-ARG RELEASE
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG JMX_EXPORTER
-ARG AWS_JAVA_SDK_BUNDLE
-ARG AZURE_STORAGE
-ARG AZURE_KEYVAULT_CORE
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG JMX_EXPORTER_VERSION
+ARG AWS_JAVA_SDK_BUNDLE_VERSION
+ARG AZURE_STORAGE_VERSION
+ARG AZURE_KEYVAULT_CORE_VERSION
 ARG STACKABLE_USER_UID
 
 # Setting this to anything other than "true" will keep the cache folders around (e.g. for Maven, NPM etc.)
@@ -28,11 +28,11 @@ ARG DELETE_CACHES="true"
 
 # Copy patches into the builder
 COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/patches/patchable.toml /stackable/src/hive/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/patches/${PRODUCT} /stackable/src/hive/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/patches/${PRODUCT_VERSION} /stackable/src/hive/stackable/patches/${PRODUCT_VERSION}
 # It is useful to see which version of Hadoop is used at a glance
 # Therefore the use of the full name here
 # TODO: Do we really need all of Hadoop in here?
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/patched-libs /stackable/patched-libs
 
 USER ${STACKABLE_USER_UID}
@@ -40,14 +40,14 @@ WORKDIR /stackable
 
 # Cache mounts are owned by root by default
 # We need to explicitly give the uid to use
-RUN --mount=type=cache,id=maven-hive-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
-BUILD_SRC_DIR="$(/stackable/patchable --images-repo-root=src checkout hive ${PRODUCT})"
+RUN --mount=type=cache,id=maven-hive-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+BUILD_SRC_DIR="$(/stackable/patchable --images-repo-root=src checkout hive ${PRODUCT_VERSION})"
 cd "$BUILD_SRC_DIR"
 
 # Make Maven aware of custom Stackable libraries
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 # generateBackupPoms=false is needed for the Hive 4.0.0 build to succeed, otherwise it fails with the obscure reason: `Too many files with unapproved license`
 mvn versions:set -DnewVersion=$NEW_VERSION -DartifactId=* -DgroupId=* -DgenerateBackupPoms=false
@@ -55,7 +55,7 @@ mvn versions:set -DnewVersion=$NEW_VERSION -DartifactId=* -DgroupId=* -Dgenerate
 # Create snapshot of the source code including custom patches
 tar -czf /stackable/hive-${NEW_VERSION}-src.tar.gz .
 
-if [[ "${PRODUCT}" == "3.1.3" ]] ; then
+if [[ "${PRODUCT_VERSION}" == "3.1.3" ]] ; then
   mvn \
    clean package \
    -DskipTests \
@@ -68,7 +68,7 @@ else
     mvn \
     clean package \
     -DskipTests \
-    -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE}
+    -Dhadoop.version=${HADOOP_VERSION}-stackable${RELEASE_VERSION}
 
     # We only seem to get a .tar.gz archive, so let's extract that to the correct location
     tar --extract --directory=/stackable -f standalone-metastore/metastore-server/target/apache-hive-standalone-metastore-server-${NEW_VERSION}-bin.tar.gz
@@ -85,24 +85,24 @@ cd /stackable
 rm -rf "$BUILD_SRC_DIR"
 
 mkdir /stackable/jmx
-curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
+curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
 
 # The next two sections for S3 and Azure use hardcoded version numbers on purpose instead of wildcards
 # This way the build will fail should one of the files not be available anymore in a later Hadoop version!
 
 # Add S3 Support for Hive (support for s3a://)
-cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE}.jar /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin/lib/
+cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/lib/
 
 # According to https://hadoop.apache.org/docs/stable/hadoop-aws/tools/hadoop-aws/aws_sdk_upgrade.html, the jar filename has changed from
-# aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE}.jar to bundle-${AWS_JAVA_SDK_BUNDLE}.jar. In future, you might need to do:
-# cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE}.jar /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin/lib/
-cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE}.jar /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin/lib/
+# aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar to bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar. In future, you might need to do:
+# cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/lib/
+cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/lib/
 
 # Add Azure ABFS support (support for abfs://)
-cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
-cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/azure-storage-${AZURE_STORAGE}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
-cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}/share/hadoop/tools/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
+cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
+cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/azure-storage-${AZURE_STORAGE_VERSION}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
+cp /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}/share/hadoop/tools/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE_VERSION}.jar /stackable/apache-hive-metastore-${NEW_VERSION}-bin/lib/
 
 # We're removing these to make the intermediate layer smaller
 # This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
@@ -119,13 +119,13 @@ chmod --recursive g=u /stackable
 EOF
 
 
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG RELEASE
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 
@@ -133,15 +133,15 @@ ARG NAME="Apache Hive metastore"
 ARG DESCRIPTION="This image is deployed by the Stackable Operator for Apache Hive."
 
 LABEL name="Apache Hive metastore"
-LABEL version="${PRODUCT}"
-LABEL release="${RELEASE}"
+LABEL version="${PRODUCT_VERSION}"
+LABEL release="${RELEASE_VERSION}"
 LABEL summary="The Stackable image for Apache Hive metastore."
 LABEL description="${DESCRIPTION}"
 
 # https://github.com/opencontainers/image-spec/blob/036563a4a268d7c08b51a08f05a02a0fe74c7268/annotations.md#annotations
 LABEL org.opencontainers.image.documentation="https://docs.stackable.tech/home/stable/hive/"
-LABEL org.opencontainers.image.version="${PRODUCT}"
-LABEL org.opencontainers.image.revision="${RELEASE}"
+LABEL org.opencontainers.image.version="${PRODUCT_VERSION}"
+LABEL org.opencontainers.image.revision="${RELEASE_VERSION}"
 LABEL org.opencontainers.image.title="${NAME}"
 LABEL org.opencontainers.image.description="${DESCRIPTION}"
 
@@ -153,30 +153,30 @@ LABEL io.k8s.display-name="${NAME}"
 
 WORKDIR /stackable
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/hive-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/hive-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION} /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hadoop-builder /stackable/*-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=hive-builder /stackable/jmx /stackable/jmx
 COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/jmx /stackable/jmx
-COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/bin/start-metastore /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin/bin
+COPY --chown=${STACKABLE_USER_UID}:0 hive/stackable/bin/start-metastore /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/bin
 
 COPY hive/licenses /licenses
 
 RUN <<EOF
 microdnf update
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-chmod g=u /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin/bin/start-metastore
+chmod g=u /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/bin/start-metastore
 
-ln -s /stackable/apache-hive-metastore-${PRODUCT}-stackable${RELEASE}-bin /stackable/hive-metastore
+ln -s /stackable/apache-hive-metastore-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin /stackable/hive-metastore
 chown -h ${STACKABLE_USER_UID}:0 /stackable/hive-metastore
 chmod g=u /stackable/hive-metastore
-ln -s /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE} /stackable/hadoop
+ln -s /stackable/hadoop-${HADOOP_VERSION}-stackable${RELEASE_VERSION} /stackable/hadoop
 chown -h ${STACKABLE_USER_UID}:0 /stackable/hadoop
 chmod g=u /stackable/hadoop
 chmod g=u /stackable/*-src.tar.gz
diff --git a/hive/boil-config.toml b/hive/boil-config.toml
new file mode 100644
index 000000000..7bbcca500
--- /dev/null
+++ b/hive/boil-config.toml
@@ -0,0 +1,38 @@
+[versions."3.1.3".local-images]
+# Hive 3 must be built with Java 8 but will run on Java 11
+java-base = "11"
+java-devel = "8"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."3.1.3".build-arguments]
+jmx-exporter-version = "1.3.0"
+# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
+aws-java-sdk-bundle-version = "1.12.367"
+azure-storage-version = "7.0.1"
+azure-keyvault-core-version = "1.0.0"
+
+[versions."4.0.0".local-images]
+# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
+java-base = "11"
+java-devel = "8"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."4.0.0".build-arguments]
+jmx-exporter-version = "1.3.0"
+# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
+aws-java-sdk-bundle-version = "1.12.367"
+azure-storage-version = "7.0.1"
+azure-keyvault-core-version = "1.0.0"
+
+[versions."4.0.1".local-images]
+# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
+java-base = "11"
+java-devel = "8"
+"hadoop/hadoop" = "3.3.6"
+
+[versions."4.0.1".build-arguments]
+jmx-exporter-version = "1.3.0"
+# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
+aws-java-sdk-bundle-version = "1.12.367"
+azure-storage-version = "7.0.1"
+azure-keyvault-core-version = "1.0.0"
diff --git a/hive/versions.py b/hive/versions.py
deleted file mode 100644
index d28fa84be..000000000
--- a/hive/versions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-versions = [
-    {
-        "product": "3.1.3",
-        "jmx_exporter": "1.3.0",
-        # Hive 3 must be built with Java 8 but will run on Java 11
-        "java-base": "11",
-        "java-devel": "8",
-        "hadoop/hadoop": "3.3.6",
-        # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
-        "aws_java_sdk_bundle": "1.12.367",
-        "azure_storage": "7.0.1",
-        "azure_keyvault_core": "1.0.0",
-    },
-    {
-        "product": "4.0.0",
-        "jmx_exporter": "1.3.0",
-        # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
-        "java-base": "11",
-        "java-devel": "8",
-        "hadoop/hadoop": "3.3.6",
-        # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
-        "aws_java_sdk_bundle": "1.12.367",
-        "azure_storage": "7.0.1",
-        "azure_keyvault_core": "1.0.0",
-    },
-    {
-        "product": "4.0.1",
-        "jmx_exporter": "1.3.0",
-        # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
-        "java-base": "11",
-        "java-devel": "8",
-        "hadoop/hadoop": "3.3.6",
-        # Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
-        "aws_java_sdk_bundle": "1.12.367",
-        "azure_storage": "7.0.1",
-        "azure_keyvault_core": "1.0.0",
-    },
-]
diff --git a/java-base/Dockerfile b/java-base/Dockerfile
index 397587d2f..610eb5a46 100644
--- a/java-base/Dockerfile
+++ b/java-base/Dockerfile
@@ -4,16 +4,16 @@
 #
 # Provides the common Java Runtime for SDP products
 #
-FROM stackable/image/vector
+FROM local-image/vector
 
-ARG PRODUCT
-ARG RELEASE="1"
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION="1"
 
 LABEL name="Stackable image for OpenJDK" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable OpenJDK base image." \
     description="This image is the base image for all Stackable Java product images."
 
@@ -32,7 +32,7 @@ EOF
 RUN microdnf update && \
     microdnf install \
     # Needed to run Java programs
-    "temurin-${PRODUCT}-jre" \
+    "temurin-${PRODUCT_VERSION}-jre" \
     # Needed, because otherwise e.g. Zookeeper fails with
     # Caused by: java.io.FileNotFoundException: /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat (No such file or directory)
     tzdata-java \
@@ -43,7 +43,7 @@ RUN microdnf update && \
 
 COPY java-base/licenses /licenses
 
-ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jre"
+ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT_VERSION}-jre"
 
 # This image doesn't include the development packages for Java.
 # For images that need the devel package (ex. Spark) use this env variable to
@@ -51,7 +51,7 @@ ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jre"
 #
 # microdnf install java-${JAVA_VERSION}-openjdk-devel
 #
-ENV JAVA_VERSION=$PRODUCT
+ENV JAVA_VERSION=$PRODUCT_VERSION
 
 # Mitigation for CVE-2021-44228 (Log4Shell)
 # This variable is supported as of Log4j version 2.10 and
diff --git a/java-base/boil-config.toml b/java-base/boil-config.toml
new file mode 100644
index 000000000..c7968ebf0
--- /dev/null
+++ b/java-base/boil-config.toml
@@ -0,0 +1,20 @@
+[versions."8".local-images]
+vector = "0.47.0"
+
+[versions."11".local-images]
+vector = "0.47.0"
+
+[versions."17".local-images]
+vector = "0.47.0"
+
+[versions."21".local-images]
+vector = "0.47.0"
+
+[versions."22".local-images]
+vector = "0.47.0"
+
+[versions."23".local-images]
+vector = "0.47.0"
+
+[versions."24".local-images]
+vector = "0.47.0"
diff --git a/java-base/versions.py b/java-base/versions.py
deleted file mode 100644
index 036d18203..000000000
--- a/java-base/versions.py
+++ /dev/null
@@ -1,30 +0,0 @@
-versions = [
-    {
-        "product": "8",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "11",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "17",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "21",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "22",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "23",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "24",
-        "vector": "0.47.0",
-    },
-]
diff --git a/java-devel/Dockerfile b/java-devel/Dockerfile
index 8a4343aed..b88e26498 100644
--- a/java-devel/Dockerfile
+++ b/java-devel/Dockerfile
@@ -5,9 +5,9 @@
 # Base image for builder stages in Java based products
 #
 
-FROM stackable/image/stackable-devel
+FROM local-image/stackable-devel
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 
 # Find the latest version here: https://github.com/apache/maven
@@ -46,7 +46,7 @@ microdnf install \
   `# Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper` \
   hostname \
   `# Needed for compiling Java projects` \
-  "temurin-${PRODUCT}-jdk" \
+  "temurin-${PRODUCT_VERSION}-jdk" \
   krb5-devel \
   libcurl-devel \
   make \
@@ -66,7 +66,7 @@ ln -s /opt/maven/bin/mvn /usr/bin/mvn
 
 EOF
 
-ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
+ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT_VERSION}-jdk"
 ENV MAVEN_ARGS="--batch-mode --no-transfer-progress"
 
 COPY --chown=${STACKABLE_USER_UID}:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml
diff --git a/java-devel/boil-config.toml b/java-devel/boil-config.toml
new file mode 100644
index 000000000..b6d750b42
--- /dev/null
+++ b/java-devel/boil-config.toml
@@ -0,0 +1,20 @@
+[versions."8".local-images]
+stackable-devel = "1.0.0"
+
+[versions."11".local-images]
+stackable-devel = "1.0.0"
+
+[versions."17".local-images]
+stackable-devel = "1.0.0"
+
+[versions."21".local-images]
+stackable-devel = "1.0.0"
+
+[versions."22".local-images]
+stackable-devel = "1.0.0"
+
+[versions."23".local-images]
+stackable-devel = "1.0.0"
+
+[versions."24".local-images]
+stackable-devel = "1.0.0"
diff --git a/java-devel/versions.py b/java-devel/versions.py
deleted file mode 100644
index cd0838e4f..000000000
--- a/java-devel/versions.py
+++ /dev/null
@@ -1,30 +0,0 @@
-versions = [
-    {
-        "product": "8",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "11",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "17",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "21",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "22",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "23",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "24",
-        "stackable-devel": "1.0.0",
-    },
-]
diff --git a/jdk-base/Dockerfile b/jdk-base/Dockerfile
index 776804c1d..914ab6cf9 100644
--- a/jdk-base/Dockerfile
+++ b/jdk-base/Dockerfile
@@ -4,16 +4,16 @@
 #
 # Provides the common Java Development Kit for SDP products
 #
-FROM stackable/image/vector
+FROM local-image/vector
 
-ARG PRODUCT
-ARG RELEASE="1"
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION="1"
 
 LABEL name="Stackable image for OpenJDK" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable OpenJDK base image." \
     description="This image is the base image for all Stackable Java product images which require a JDK."
 
@@ -32,7 +32,7 @@ EOF
 RUN microdnf update && \
     microdnf install \
     # Needed to run Java programs
-    "temurin-${PRODUCT}-jdk" \
+    "temurin-${PRODUCT_VERSION}-jdk" \
     # Needed, because otherwise e.g. Zookeeper fails with
     # Caused by: java.io.FileNotFoundException: /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat (No such file or directory)
     tzdata-java \
@@ -43,7 +43,7 @@ RUN microdnf update && \
 
 COPY java-base/licenses /licenses
 
-ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
+ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT_VERSION}-jdk"
 
 # This image doesn't include the development packages for Java.
 # For images that need the devel package (ex. Spark) use this env variable to
@@ -51,7 +51,7 @@ ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
 #
 # microdnf install java-${JAVA_VERSION}-openjdk-devel
 #
-ENV JAVA_VERSION=$PRODUCT
+ENV JAVA_VERSION=$PRODUCT_VERSION
 
 # Mitigation for CVE-2021-44228 (Log4Shell)
 # This variable is supported as of Log4j version 2.10 and
diff --git a/jdk-base/boil-config.toml b/jdk-base/boil-config.toml
new file mode 100644
index 000000000..c7968ebf0
--- /dev/null
+++ b/jdk-base/boil-config.toml
@@ -0,0 +1,20 @@
+[versions."8".local-images]
+vector = "0.47.0"
+
+[versions."11".local-images]
+vector = "0.47.0"
+
+[versions."17".local-images]
+vector = "0.47.0"
+
+[versions."21".local-images]
+vector = "0.47.0"
+
+[versions."22".local-images]
+vector = "0.47.0"
+
+[versions."23".local-images]
+vector = "0.47.0"
+
+[versions."24".local-images]
+vector = "0.47.0"
diff --git a/jdk-base/versions.py b/jdk-base/versions.py
deleted file mode 100644
index 036d18203..000000000
--- a/jdk-base/versions.py
+++ /dev/null
@@ -1,30 +0,0 @@
-versions = [
-    {
-        "product": "8",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "11",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "17",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "21",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "22",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "23",
-        "vector": "0.47.0",
-    },
-    {
-        "product": "24",
-        "vector": "0.47.0",
-    },
-]
diff --git a/kafka-testing-tools/Dockerfile b/kafka-testing-tools/Dockerfile
index cbfb4299c..7f1e563d7 100644
--- a/kafka-testing-tools/Dockerfile
+++ b/kafka-testing-tools/Dockerfile
@@ -1,20 +1,20 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/kafka/kcat AS kcat
+FROM local-image/kafka/kcat AS kcat
 
-FROM stackable/image/stackable-base AS final
+FROM local-image/stackable-base AS final
 
-ARG PRODUCT
-ARG KAFKA_KCAT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG KAFKA_KCAT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Kafka Testing Tools" \
       maintainer="info@stackable.tech" \
       vendor="Stackable GmbH" \
-      version="${PRODUCT}" \
-      release="${RELEASE}" \
+      version="${PRODUCT_VERSION}" \
+      release="${RELEASE_VERSION}" \
       summary="The Stackable image for the kcat tool." \
       description="Used for integration testing"
 
@@ -30,9 +30,9 @@ RUN microdnf install  \
     && rm -rf /var/cache/yum
 
 # Store kcat version with binary name and add softlink
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/kcat-${KAFKA_KCAT}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT}-src.tar.gz /stackable
-RUN ln -s /stackable/kcat-${KAFKA_KCAT} /stackable/kcat
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/kcat-${KAFKA_KCAT_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT_VERSION}-src.tar.gz /stackable
+RUN ln -s /stackable/kcat-${KAFKA_KCAT_VERSION} /stackable/kcat
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /licenses /licenses
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka-testing-tools/licenses /licenses
diff --git a/kafka-testing-tools/boil-config.toml b/kafka-testing-tools/boil-config.toml
new file mode 100644
index 000000000..ca78f8116
--- /dev/null
+++ b/kafka-testing-tools/boil-config.toml
@@ -0,0 +1,4 @@
+[versions."1.0.0".local-images]
+stackable-base = "1.0.0"
+"kafka/kcat" = "1.7.0"
+java-base = "11"
diff --git a/kafka-testing-tools/versions.py b/kafka-testing-tools/versions.py
deleted file mode 100644
index b706d446e..000000000
--- a/kafka-testing-tools/versions.py
+++ /dev/null
@@ -1,8 +0,0 @@
-versions = [
-    {
-        "product": "1.0.0",
-        "kafka/kcat": "1.7.0",
-        "java-base": "11",
-        "stackable-base": "1.0.0",
-    }
-]
diff --git a/kafka/Dockerfile b/kafka/Dockerfile
index e01f09fda..f9dffb9dd 100644
--- a/kafka/Dockerfile
+++ b/kafka/Dockerfile
@@ -1,15 +1,15 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/kafka/kcat AS kcat
-FROM stackable/image/kafka/kafka-opa-plugin AS kafka-opa-plugin
+FROM local-image/kafka/kcat AS kcat
+FROM local-image/kafka/kafka-opa-plugin AS kafka-opa-plugin
 
-FROM stackable/image/java-devel AS kafka-builder
+FROM local-image/java-devel AS kafka-builder
 
-ARG PRODUCT
-ARG RELEASE
-ARG SCALA
-ARG JMX_EXPORTER
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG SCALA_VERSION
+ARG JMX_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
@@ -17,15 +17,15 @@ WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/stackable/jmx/ /stackable/jmx/
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/stackable/patches/patchable.toml /stackable/src/kafka/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 kafka/stackable/patches/${PRODUCT} /stackable/src/kafka/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 kafka/stackable/patches/${PRODUCT_VERSION} /stackable/src/kafka/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout kafka ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout kafka ${PRODUCT_VERSION})"
 
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 # The comment in gradle.properties mentions to update the version in all of these files
-find . -type f -print0 | xargs -0 sed -i "s/\-stackable0\.0\.0\-dev/-stackable${RELEASE}/g"
+find . -type f -print0 | xargs -0 sed -i "s/\-stackable0\.0\.0\-dev/-stackable${RELEASE_VERSION}/g"
 
 # Create snapshot of the source code including custom patches
 tar -czf /stackable/kafka-${NEW_VERSION}-src.tar.gz .
@@ -36,48 +36,48 @@ tar -czf /stackable/kafka-${NEW_VERSION}-src.tar.gz .
 # it's a good idea to run the tests in this case.
 ./gradlew clean releaseTarGz
 ./gradlew cyclonedxBom
-tar -xf core/build/distributions/kafka_${SCALA}-${NEW_VERSION}.tgz -C /stackable
-cp build/reports/bom.json /stackable/kafka_${SCALA}-${NEW_VERSION}.cdx.json
-rm -rf /stackable/kafka_${SCALA}-${NEW_VERSION}/site-docs/
-(cd .. && rm -rf ${PRODUCT})
+tar -xf core/build/distributions/kafka_${SCALA_VERSION}-${NEW_VERSION}.tgz -C /stackable
+cp build/reports/bom.json /stackable/kafka_${SCALA_VERSION}-${NEW_VERSION}.cdx.json
+rm -rf /stackable/kafka_${SCALA_VERSION}-${NEW_VERSION}/site-docs/
+(cd .. && rm -rf ${PRODUCT_VERSION})
 
 # JMX exporter
-curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar \
-  -o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
-chmod +x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
-ln -s /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar /stackable/jmx/jmx_prometheus_javaagent.jar
+curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar \
+  -o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
+chmod +x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
+ln -s /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar /stackable/jmx/jmx_prometheus_javaagent.jar
 
 # change groups
 chmod -R g=u /stackable
 EOF
 
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG RELEASE
-ARG PRODUCT
-ARG SCALA
-ARG KAFKA_KCAT
-ARG KAFKA_KAFKA_OPA_PLUGIN
+ARG RELEASE_VERSION
+ARG PRODUCT_VERSION
+ARG SCALA_VERSION
+ARG KAFKA_KCAT_VERSION
+ARG KAFKA_KAFKA_OPA_PLUGIN_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL \
   name="Apache Kafka" \
   maintainer="info@stackable.tech" \
   vendor="Stackable GmbH" \
-  version="${PRODUCT}" \
-  release="${RELEASE}" \
+  version="${PRODUCT_VERSION}" \
+  release="${RELEASE_VERSION}" \
   summary="The Stackable image for Apache Kafka." \
   description="This image is deployed by the Stackable Operator for Apache Kafka."
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE} /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}.cdx.json /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}.cdx.json
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka-${PRODUCT}-stackable${RELEASE}-src.tar.gz  /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/kafka-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz  /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-builder /stackable/jmx/ /stackable/jmx/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/bin/kcat-${KAFKA_KCAT}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat /stackable/bin/kcat-${KAFKA_KCAT_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /stackable/kcat-${KAFKA_KCAT_VERSION}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=kcat /licenses /licenses
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/src/kafka/kafka-opa-plugin/patchable-work/worktree/${KAFKA_KAFKA_OPA_PLUGIN}/build/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
-COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/kafka-opa-plugin-${KAFKA_KAFKA_OPA_PLUGIN}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/src/kafka/kafka-opa-plugin/patchable-work/worktree/${KAFKA_KAFKA_OPA_PLUGIN_VERSION}/build/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN_VERSION}-all.jar /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN_VERSION}-all.jar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=kafka-opa-plugin /stackable/kafka-opa-plugin-${KAFKA_KAFKA_OPA_PLUGIN_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/licenses /licenses
 
@@ -90,24 +90,24 @@ microdnf install \
   cyrus-sasl-gssapi
 
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-ln -s /stackable/bin/kcat-${KAFKA_KCAT} /stackable/bin/kcat
+ln -s /stackable/bin/kcat-${KAFKA_KCAT_VERSION} /stackable/bin/kcat
 chown -h ${STACKABLE_USER_UID}:0 /stackable/bin/kcat
 # kcat was located in /stackable/kcat - legacy
 ln -s /stackable/bin/kcat /stackable/kcat
 chown -h ${STACKABLE_USER_UID}:0 /stackable/kcat
-ln -s /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE} /stackable/kafka
+ln -s /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/kafka
 chown -h ${STACKABLE_USER_UID}:0 /stackable/kafka
 
 # fix missing permissions
 chmod g=u /stackable/bin
 chmod g=u /stackable/jmx
-chmod g=u /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}
-chmod g=u /stackable/kafka_${SCALA}-${PRODUCT}-stackable${RELEASE}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN}-all.jar
+chmod g=u /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+chmod g=u /stackable/kafka_${SCALA_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/libs/opa-authorizer-${KAFKA_KAFKA_OPA_PLUGIN_VERSION}-all.jar
 chmod g=u /stackable/*-src.tar.gz
 EOF
 
diff --git a/kafka/boil-config.toml b/kafka/boil-config.toml
new file mode 100644
index 000000000..9d7fc2ad1
--- /dev/null
+++ b/kafka/boil-config.toml
@@ -0,0 +1,39 @@
+[versions."3.7.2".local-images]
+java-base = "21"
+java-devel = "21"
+"kafka/kcat" = "1.7.0"
+"kafka/kafka-opa-plugin" = "1.5.1"
+
+[versions."3.7.2".build-arguments]
+scala-version = "2.13"
+jmx-exporter-version = "1.3.0"
+
+[versions."3.9.0".local-images]
+java-base = "21"
+java-devel = "21"
+"kafka/kcat" = "1.7.0"
+"kafka/kafka-opa-plugin" = "1.5.1"
+
+[versions."3.9.0".build-arguments]
+scala-version = "2.13"
+jmx-exporter-version = "1.3.0"
+
+[versions."3.9.1".local-images]
+java-base = "21"
+java-devel = "21"
+"kafka/kcat" = "1.7.0"
+"kafka/kafka-opa-plugin" = "1.5.1"
+
+[versions."3.9.1".build-arguments]
+scala-version = "2.13"
+jmx-exporter-version = "1.3.0"
+
+[versions."4.0.0".local-images]
+java-base = "23"
+java-devel = "23"
+"kafka/kcat" = "1.7.0"
+"kafka/kafka-opa-plugin" = "1.5.1"
+
+[versions."4.0.0".build-arguments]
+scala-version = "2.13"
+jmx-exporter-version = "1.3.0"
diff --git a/kafka/kafka-opa-plugin/Dockerfile b/kafka/kafka-opa-plugin/Dockerfile
index 2a5df3166..f963a2cb3 100644
--- a/kafka/kafka-opa-plugin/Dockerfile
+++ b/kafka/kafka-opa-plugin/Dockerfile
@@ -1,22 +1,22 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-devel
+FROM local-image/java-devel
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/kafka-opa-plugin/stackable/patches/patchable.toml /stackable/src/kafka/kafka-opa-plugin/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 kafka/kafka-opa-plugin/stackable/patches/${PRODUCT} /stackable/src/kafka/kafka-opa-plugin/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 kafka/kafka-opa-plugin/stackable/patches/${PRODUCT_VERSION} /stackable/src/kafka/kafka-opa-plugin/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout kafka/kafka-opa-plugin ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout kafka/kafka-opa-plugin ${PRODUCT_VERSION})"
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/kafka-opa-plugin-${PRODUCT}-src.tar.gz .
+tar -czf /stackable/kafka-opa-plugin-${PRODUCT_VERSION}-src.tar.gz .
 
 ./gradlew clean shadowJar
 EOF
diff --git a/kafka/kafka-opa-plugin/boil-config.toml b/kafka/kafka-opa-plugin/boil-config.toml
new file mode 100644
index 000000000..3a4da3b03
--- /dev/null
+++ b/kafka/kafka-opa-plugin/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."1.5.1".local-images]
+java-devel = "11"
diff --git a/kafka/kafka-opa-plugin/versions.py b/kafka/kafka-opa-plugin/versions.py
deleted file mode 100644
index 602909cd2..000000000
--- a/kafka/kafka-opa-plugin/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "1.5.1",
-        "java-devel": "11",
-    },
-]
diff --git a/kafka/kcat/Dockerfile b/kafka/kcat/Dockerfile
index 93dc7d251..d836c8abf 100644
--- a/kafka/kcat/Dockerfile
+++ b/kafka/kcat/Dockerfile
@@ -4,9 +4,9 @@
 # Normally we would use stackable/image/stackable-base here, *but* we fail to link kcat at the end with error messages
 # shown in Snippet 1, which we were not able to solve.
 
-FROM stackable/image/java-devel AS builder
+FROM local-image/java-devel AS builder
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 
 RUN <<EOF
@@ -31,19 +31,19 @@ EOF
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/kcat/stackable/patches/patchable.toml /stackable/src/kafka/kcat/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 kafka/kcat/stackable/patches/${PRODUCT} /stackable/src/kafka/kcat/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 kafka/kcat/stackable/patches/${PRODUCT_VERSION} /stackable/src/kafka/kcat/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout kafka/kcat ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout kafka/kcat ${PRODUCT_VERSION})"
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/kcat-${PRODUCT}-src.tar.gz .
+tar -czf /stackable/kcat-${PRODUCT_VERSION}-src.tar.gz .
 
 ./bootstrap.sh
 mv kcat /stackable/kcat
 # set correct permissions
 chmod --recursive g=u /stackable/kcat
-chmod g=u /stackable/kcat-${PRODUCT}-src.tar.gz
+chmod g=u /stackable/kcat-${PRODUCT_VERSION}-src.tar.gz
 EOF
 
 COPY --chown=${STACKABLE_USER_UID}:0 kafka/kcat/licenses /licenses
diff --git a/kafka/kcat/boil-config.toml b/kafka/kcat/boil-config.toml
new file mode 100644
index 000000000..b13b50064
--- /dev/null
+++ b/kafka/kcat/boil-config.toml
@@ -0,0 +1,3 @@
+[versions."1.7.0".local-images]
+java-devel = "11"
+stackable-devel = "1.0.0"
diff --git a/kafka/kcat/versions.py b/kafka/kcat/versions.py
deleted file mode 100644
index 80f708acd..000000000
--- a/kafka/kcat/versions.py
+++ /dev/null
@@ -1,7 +0,0 @@
-versions = [
-    {
-        "product": "1.7.0",
-        "java-devel": "11",
-        "stackable-devel": "1.0.0",
-    }
-]
diff --git a/kafka/versions.py b/kafka/versions.py
deleted file mode 100644
index bf16adadb..000000000
--- a/kafka/versions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-versions = [
-    {
-        "product": "3.7.2",
-        "java-base": "21",
-        "java-devel": "21",
-        "scala": "2.13",
-        "kafka/kcat": "1.7.0",
-        "kafka/kafka-opa-plugin": "1.5.1",
-        "jmx_exporter": "1.3.0",
-    },
-    {
-        "product": "3.9.0",
-        "java-base": "21",
-        "java-devel": "21",
-        "scala": "2.13",
-        "kafka/kcat": "1.7.0",
-        "kafka/kafka-opa-plugin": "1.5.1",
-        "jmx_exporter": "1.3.0",
-    },
-    {
-        "product": "3.9.1",
-        "java-base": "21",
-        "java-devel": "21",
-        "scala": "2.13",
-        "kafka/kcat": "1.7.0",
-        "kafka/kafka-opa-plugin": "1.5.1",
-        "jmx_exporter": "1.3.0",
-    },
-    {
-        "product": "4.0.0",
-        "java-base": "23",
-        "java-devel": "23",
-        "scala": "2.13",
-        "kafka/kcat": "1.7.0",
-        "kafka/kafka-opa-plugin": "1.5.1",
-        "jmx_exporter": "1.3.0",
-    },
-]
diff --git a/krb5/Dockerfile b/krb5/Dockerfile
index 8dc5b9f1e..648ae78dd 100644
--- a/krb5/Dockerfile
+++ b/krb5/Dockerfile
@@ -2,11 +2,11 @@
 # check=error=true
 
 # RedHat UBI does not package krb5-server, so we cannot use it as a KDC
-# FROM stackable/image/stackable-base
+# FROM local-image/stackable-base
 FROM rockylinux:9.3@sha256:d7be1c094cc5845ee815d4632fe377514ee6ebcf8efaed6892889657e5ddaaa6
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 
 RUN dnf update --assumeyes && \
-    dnf install --assumeyes krb5-workstation-${PRODUCT} krb5-server-${PRODUCT} && \
+    dnf install --assumeyes krb5-workstation-${PRODUCT_VERSION} krb5-server-${PRODUCT_VERSION} && \
     dnf clean all
diff --git a/krb5/boil-config.toml b/krb5/boil-config.toml
new file mode 100644
index 000000000..dc853fd32
--- /dev/null
+++ b/krb5/boil-config.toml
@@ -0,0 +1 @@
+[versions."1.21.1"]
diff --git a/krb5/versions.py b/krb5/versions.py
deleted file mode 100644
index fcf6ef066..000000000
--- a/krb5/versions.py
+++ /dev/null
@@ -1,5 +0,0 @@
-versions = [
-    {
-        "product": "1.21.1",
-    },
-]
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
index d40385498..462f66afd 100644
--- a/nifi/Dockerfile
+++ b/nifi/Dockerfile
@@ -1,14 +1,14 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true;skip=InvalidDefaultArgInFrom
 
-ARG GIT_SYNC
+ARG GIT_SYNC_VERSION
 
-FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC} AS git-sync-image
+FROM oci.stackable.tech/sdp/git-sync/git-sync:${GIT_SYNC_VERSION} AS git-sync-image
 
-FROM stackable/image/java-devel AS nifi-builder
+FROM local-image/java-devel AS nifi-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 RUN <<EOF
@@ -21,7 +21,7 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/patchable.toml /stackable/src/nifi/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/${PRODUCT} /stackable/src/nifi/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/patches/${PRODUCT_VERSION} /stackable/src/nifi/stackable/patches/${PRODUCT_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=git-sync-image /git-sync /stackable/git-sync
 
 RUN <<EOF
@@ -29,10 +29,10 @@ RUN <<EOF
 curl 'https://repo.stackable.tech/repository/m2/tech/stackable/nifi/stackable-bcrypt/1.0-SNAPSHOT/stackable-bcrypt-1.0-20240508.153334-1-jar-with-dependencies.jar' \
     -o /stackable/stackable-bcrypt.jar
 
-cd "$(/stackable/patchable --images-repo-root=src checkout nifi ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout nifi ${PRODUCT_VERSION})"
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -41,7 +41,7 @@ tar -czf /stackable/nifi-${NEW_VERSION}-src.tar.gz .
 
 # NOTE: Since NiFi 2.0.0 PutIceberg Processor and services were removed, so including the `include-iceberg` profile does nothing.
 # Additionally some modules were moved to optional build profiles, so we need to add `include-hadoop` to get `nifi-parquet-nar` for example.
-if [[ "${PRODUCT}" != 1.* ]] ; then
+if [[ "${PRODUCT_VERSION}" != 1.* ]] ; then
     mvn \
     clean install \
     -Dmaven.javadoc.skip=true \
@@ -77,7 +77,7 @@ for nar in $NARS; do
 done
 
 # Remove sources
-(cd .. && rm -r ${PRODUCT})
+(cd .. && rm -r ${PRODUCT_VERSION})
 
 # Remove generated docs in binary
 rm -rf /stackable/nifi-${NEW_VERSION}/docs
@@ -86,44 +86,44 @@ rm -rf /stackable/nifi-${NEW_VERSION}/docs
 chmod -R g=u /stackable
 EOF
 
-FROM stackable/image/java-devel AS nifi-iceberg-bundle-builder
+FROM local-image/java-devel AS nifi-iceberg-bundle-builder
 
-ARG NIFI_ICEBERG_BUNDLE
-ARG PRODUCT
+ARG NIFI_ICEBERG_BUNDLE_VERSION
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/nifi-iceberg-bundle/stackable/patches/patchable.toml /stackable/src/nifi/nifi-iceberg-bundle/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 nifi/nifi-iceberg-bundle/stackable/patches/${NIFI_ICEBERG_BUNDLE} /stackable/src/nifi/nifi-iceberg-bundle/stackable/patches/${NIFI_ICEBERG_BUNDLE}
+COPY --chown=${STACKABLE_USER_UID}:0 nifi/nifi-iceberg-bundle/stackable/patches/${NIFI_ICEBERG_BUNDLE_VERSION} /stackable/src/nifi/nifi-iceberg-bundle/stackable/patches/${NIFI_ICEBERG_BUNDLE_VERSION}
 
 RUN <<EOF
 mkdir -p /stackable
 
 # NiFI 1.x natively supports Iceberg, no need to build an iceberg-bundle for it
-if [[ "${PRODUCT}" != 1.* ]] ; then
-    cd "$(/stackable/patchable --images-repo-root=src checkout nifi/nifi-iceberg-bundle ${NIFI_ICEBERG_BUNDLE})"
+if [[ "${PRODUCT_VERSION}" != 1.* ]] ; then
+    cd "$(/stackable/patchable --images-repo-root=src checkout nifi/nifi-iceberg-bundle ${NIFI_ICEBERG_BUNDLE_VERSION})"
 
     # Create snapshot of the source code including custom patches
-    tar -czf /stackable/nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE}-src.tar.gz .
+    tar -czf /stackable/nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE_VERSION}-src.tar.gz .
 
-    sed -i -e "s/{{ NIFI_VERSION }}/${PRODUCT}/g" pom.xml
+    sed -i -e "s/{{ NIFI_VERSION }}/${PRODUCT_VERSION}/g" pom.xml
 
     mvn \
         clean package \
-        -D nifi.version=${PRODUCT} \
+        -D nifi.version=${PRODUCT_VERSION} \
         -Dmaven.javadoc.skip=true \
         -Denforcer.skip=true
     # We need "-Denforcer.skip=true", as the Maven version is too old
 
-    cp ./nifi-iceberg-services-api-nar/target/nifi-iceberg-services-api-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
-    cp ./nifi-iceberg-services-nar/target/nifi-iceberg-services-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
-    cp ./nifi-iceberg-processors-nar/target/nifi-iceberg-processors-nar-${NIFI_ICEBERG_BUNDLE}.nar /stackable
-    cp ./target/bom.json /stackable/nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE}.cdx.json
+    cp ./nifi-iceberg-services-api-nar/target/nifi-iceberg-services-api-nar-${NIFI_ICEBERG_BUNDLE_VERSION}.nar /stackable
+    cp ./nifi-iceberg-services-nar/target/nifi-iceberg-services-nar-${NIFI_ICEBERG_BUNDLE_VERSION}.nar /stackable
+    cp ./nifi-iceberg-processors-nar/target/nifi-iceberg-processors-nar-${NIFI_ICEBERG_BUNDLE_VERSION}.nar /stackable
+    cp ./target/bom.json /stackable/nifi-iceberg-bundle-${NIFI_ICEBERG_BUNDLE_VERSION}.cdx.json
 
     # Save disk space, even for intermediate images
-    (cd .. && rm -r ${NIFI_ICEBERG_BUNDLE})
+    (cd .. && rm -r ${NIFI_ICEBERG_BUNDLE_VERSION})
 
 # Set correct groups
 chmod g=u /stackable/*.nar
@@ -131,30 +131,30 @@ chmod g=u /stackable/*.cdx.json
 fi
 EOF
 
-FROM stackable/image/java-devel AS opa-authorizer-builder
+FROM local-image/java-devel AS opa-authorizer-builder
 
-ARG NIFI_OPA_AUTHORIZER_PLUGIN
+ARG NIFI_OPA_AUTHORIZER_PLUGIN_VERSION
 ARG STACKABLE_USER_UID
-ARG PRODUCT
+ARG PRODUCT_VERSION
 
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/opa-plugin/stackable/patches/patchable.toml /stackable/src/nifi/opa-plugin/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 nifi/opa-plugin/stackable/patches/${NIFI_OPA_AUTHORIZER_PLUGIN} /stackable/src/nifi/opa-plugin/stackable/patches/${NIFI_OPA_AUTHORIZER_PLUGIN}
+COPY --chown=${STACKABLE_USER_UID}:0 nifi/opa-plugin/stackable/patches/${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION} /stackable/src/nifi/opa-plugin/stackable/patches/${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION}
 
 RUN <<EOF
 mkdir -p /stackable
 
-cd "$(/stackable/patchable --images-repo-root=src checkout nifi/opa-plugin ${NIFI_OPA_AUTHORIZER_PLUGIN})/authorizer"
+cd "$(/stackable/patchable --images-repo-root=src checkout nifi/opa-plugin ${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION})/authorizer"
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/nifi-opa-plugin-${NIFI_OPA_AUTHORIZER_PLUGIN}-src.tar.gz .
+tar -czf /stackable/nifi-opa-plugin-${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION}-src.tar.gz .
 
 mvn \
     clean package \
     -DskipTests \
-    -Pnifi-${PRODUCT}
+    -Pnifi-${PRODUCT_VERSION}
 
 cp ./target/opa-authorizer.nar /stackable/opa-authorizer.nar
 cp ../LICENSE /stackable/LICENSE
@@ -163,31 +163,31 @@ cp ../LICENSE /stackable/LICENSE
 chmod g=u /stackable/opa-authorizer.nar
 EOF
 
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
-ARG NIFI_OPA_AUTHORIZER_PLUGIN
+ARG NIFI_OPA_AUTHORIZER_PLUGIN_VERSION
 
 LABEL name="Apache NiFi" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Apache NiFi." \
     description="This image is deployed by the Stackable Operator for Apache NiFi."
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT}-stackable${RELEASE} /stackable/nifi-${PRODUCT}-stackable${RELEASE}/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/stackable-bcrypt.jar /stackable/stackable-bcrypt.jar
-COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT}-stackable${RELEASE}/lib/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.cdx.json /stackable/nifi-${PRODUCT}-stackable${RELEASE}/lib/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.nar /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/lib/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*.cdx.json /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/lib/
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-iceberg-bundle-builder /stackable/*-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=nifi-builder /stackable/git-sync /stackable/git-sync
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/opa-authorizer.nar /stackable/nifi-${PRODUCT}-stackable${RELEASE}/extensions/opa-authorizer.nar
-COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/nifi-opa-plugin-${NIFI_OPA_AUTHORIZER_PLUGIN}-src.tar.gz  /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/opa-authorizer.nar /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/extensions/opa-authorizer.nar
+COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/nifi-opa-plugin-${NIFI_OPA_AUTHORIZER_PLUGIN_VERSION}-src.tar.gz  /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=opa-authorizer-builder /stackable/LICENSE /licenses/NIFI_OPA_PLUGIN_LICENSE
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/stackable/bin /stackable/bin
 COPY --chown=${STACKABLE_USER_UID}:0 nifi/licenses /licenses
@@ -220,13 +220,13 @@ pip install --no-cache-dir \
 # This can be removed once older versions / operators using this are no longer supported
 ln -s /stackable/stackable-bcrypt.jar /bin/stackable-bcrypt.jar
 
-ln -s /stackable/nifi-${PRODUCT}-stackable${RELEASE} /stackable/nifi
+ln -s /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/nifi
 
 # fix missing permissions / ownership
 chown --no-dereference ${STACKABLE_USER_UID}:0 /stackable/nifi
 chmod --recursive g=u /stackable/python
 chmod --recursive g=u /stackable/bin
-chmod g=u /stackable/nifi-${PRODUCT}-stackable${RELEASE}
+chmod g=u /stackable/nifi-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 chmod g=u /stackable/*-src.tar.gz
 EOF
 
diff --git a/nifi/boil-config.toml b/nifi/boil-config.toml
new file mode 100644
index 000000000..7dd5cb8dd
--- /dev/null
+++ b/nifi/boil-config.toml
@@ -0,0 +1,24 @@
+[versions."1.27.0".local-images]
+java-base = "11"
+java-devel = "11"
+
+[versions."1.27.0".build-arguments]
+git-sync-version = "v4.4.1"
+nifi-opa-authorizer-plugin-version = "0.1.0"
+
+[versions."1.28.1".local-images]
+java-base = "11"
+java-devel = "11"
+
+[versions."1.28.1".build-arguments]
+git-sync-version = "v4.4.1"
+nifi-opa-authorizer-plugin-version = "0.1.0"
+
+[versions."2.4.0".local-images]
+java-base = "21"
+java-devel = "21"
+
+[versions."2.4.0".build-arguments]
+git-sync-version = "v4.4.1"
+nifi-opa-authorizer-plugin-version = "0.1.0"
+nifi-iceberg-bundle-version = "0.0.4"
diff --git a/nifi/versions.py b/nifi/versions.py
deleted file mode 100644
index ea9e26360..000000000
--- a/nifi/versions.py
+++ /dev/null
@@ -1,24 +0,0 @@
-versions = [
-    {
-        "product": "1.27.0",
-        "java-base": "11",
-        "java-devel": "11",  # There is an error when trying to use the jdk 21 (since nifi 1.26.0)
-        "git_sync": "v4.4.1",
-        "nifi_opa_authorizer_plugin": "0.1.0",
-    },
-    {
-        "product": "1.28.1",
-        "java-base": "11",
-        "java-devel": "11",
-        "git_sync": "v4.4.1",
-        "nifi_opa_authorizer_plugin": "0.1.0",
-    },
-    {
-        "product": "2.4.0",
-        "java-base": "21",
-        "java-devel": "21",
-        "git_sync": "v4.4.1",
-        "nifi_iceberg_bundle": "0.0.4",
-        "nifi_opa_authorizer_plugin": "0.1.0",
-    },
-]
diff --git a/omid/Dockerfile b/omid/Dockerfile
index 33e6e760d..af261ca7d 100644
--- a/omid/Dockerfile
+++ b/omid/Dockerfile
@@ -1,10 +1,10 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-devel AS builder
+FROM local-image/java-devel AS builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG DELETE_CACHES="true"
 ARG STACKABLE_USER_UID
 
@@ -23,14 +23,14 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 omid/stackable/patches/patchable.toml /stackable/src/omid/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 omid/stackable/patches/${PRODUCT} /stackable/src/omid/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 omid/stackable/patches/${PRODUCT_VERSION} /stackable/src/omid/stackable/patches/${PRODUCT_VERSION}
 
-RUN --mount=type=cache,id=maven-omid-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
+RUN --mount=type=cache,id=maven-omid-${PRODUCT_VERSION},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
   set -x
-  cd "$(/stackable/patchable --images-repo-root=src checkout omid ${PRODUCT})"
+  cd "$(/stackable/patchable --images-repo-root=src checkout omid ${PRODUCT_VERSION})"
 
   ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-  NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+  NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
   mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -49,38 +49,38 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
 fi
 EOF
 
-FROM stackable/image/java-base
+FROM local-image/java-base
 
-ARG PRODUCT
-ARG RELEASE
-ARG JMX_EXPORTER
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG JMX_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Apache Phoenix Omid" \
       maintainer="info@stackable.tech" \
       vendor="Stackable GmbH" \
-      version="${PRODUCT}" \
-      release="${RELEASE}" \
+      version="${PRODUCT_VERSION}" \
+      release="${RELEASE_VERSION}" \
       summary="The Stackable image for Apache Phoenix Omid." \
       description="This image is deployed by the Stackable Operator for Apache HBase."
 
 COPY omid/licenses /licenses
 
 COPY --chown=${STACKABLE_USER_UID}:0 omid/stackable /stackable
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-tso-server-${PRODUCT}-stackable${RELEASE} /stackable/omid-tso-server-${PRODUCT}-stackable${RELEASE}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-examples-${PRODUCT}-stackable${RELEASE} /stackable/omid-examples-${PRODUCT}-stackable${RELEASE}
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-tso-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/omid-tso-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-examples-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/omid-examples-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/omid-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 
 RUN <<EOF
 microdnf update
 microdnf clean all
 rm -rf /var/cache/yum
 
-ln -s /stackable/omid-tso-server-${PRODUCT}-stackable${RELEASE} /stackable/omid-tso-server
-ln -s /stackable/omid-examples-${PRODUCT}-stackable${RELEASE} /stackable/omid-examples
-curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar \
--o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
-chmod -x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
+ln -s /stackable/omid-tso-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/omid-tso-server
+ln -s /stackable/omid-examples-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/omid-examples
+curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar \
+-o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
+chmod -x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
 # omid.sh places this file at the front of the classpath: remove it to allow the config map entry to take precedence
 rm /stackable/omid-tso-server/conf/hbase-site.xml
 
diff --git a/omid/boil-config.toml b/omid/boil-config.toml
new file mode 100644
index 000000000..c6df6e0db
--- /dev/null
+++ b/omid/boil-config.toml
@@ -0,0 +1,13 @@
+[versions."1.1.2".local-images]
+java-base = "11"
+java-devel = "11"
+
+[versions."1.1.2".build-arguments]
+jmx-exporter-version = "1.3.0"
+
+[versions."1.1.3".local-images]
+java-base = "11"
+java-devel = "11"
+
+[versions."1.1.3".build-arguments]
+jmx-exporter-version = "1.3.0"
diff --git a/omid/versions.py b/omid/versions.py
deleted file mode 100644
index 533cb91be..000000000
--- a/omid/versions.py
+++ /dev/null
@@ -1,14 +0,0 @@
-versions = [
-    {
-        "product": "1.1.2",
-        "java-base": "11",
-        "java-devel": "11",
-        "jmx_exporter": "1.3.0",
-    },
-    {
-        "product": "1.1.3",
-        "java-base": "11",
-        "java-devel": "11",
-        "jmx_exporter": "1.3.0",
-    },
-]
diff --git a/opa/Dockerfile b/opa/Dockerfile
index 718fe23ab..3101356af 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -1,11 +1,9 @@
-# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
-# check=error=true;skip=InvalidDefaultArgInFrom
 
-ARG GOLANG
+ARG GOLANG_VERSION
 
-FROM oci.stackable.tech/sdp/library/golang:${GOLANG} AS golang-image
+FROM oci.stackable.tech/sdp/library/golang:${GOLANG_VERSION} AS golang-image
 
-FROM stackable/image/stackable-devel AS multilog-builder
+FROM local-image/stackable-devel AS multilog-builder
 
 ARG DAEMONTOOLS_VERSION=0.76
 
@@ -38,10 +36,10 @@ package/install
 chmod g=u /daemontools/admin/daemontools/command/multilog
 EOF
 
-FROM stackable/image/stackable-devel AS opa-builder
+FROM local-image/stackable-devel AS opa-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 ARG TARGETARCH
 ARG TARGETOS
@@ -75,10 +73,10 @@ RUN <<EOF
 # We use version 1.7.0, since a newer version of cyclonedx-gomod is not compatible with the version of Golang (>= 1.23.1)
 go install github.com/CycloneDX/cyclonedx-gomod/cmd/cyclonedx-gomod@v1.7.0
 
-cd "$(/stackable/patchable --images-repo-root=src checkout opa ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout opa ${PRODUCT_VERSION})"
 
-ORIGINAL_VERSION=${PRODUCT}
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+ORIGINAL_VERSION=${PRODUCT_VERSION}
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 sed -i 's/var Version = "'${ORIGINAL_VERSION}'"/var Version = "'${NEW_VERSION}'"/g' v1/version/version.go
 
@@ -102,24 +100,24 @@ mv opa /stackable/opa/
 chmod -R g=u /stackable/opa /stackable/opa-${NEW_VERSION}-src.tar.gz
 EOF
 
-FROM stackable/image/vector
+FROM local-image/vector
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Open Policy Agent" \
   maintainer="info@stackable.tech" \
   vendor="Stackable GmbH" \
-  version="${PRODUCT}" \
-  release="${RELEASE}" \
+  version="${PRODUCT_VERSION}" \
+  release="${RELEASE_VERSION}" \
   summary="The Stackable image for Open Policy Agent (OPA)." \
   description="This image is deployed by the Stackable Operator for OPA."
 
 COPY --chown=${STACKABLE_USER_UID}:0 opa/licenses /licenses
 
 COPY --from=opa-builder --chown=${STACKABLE_USER_UID}:0 /stackable/opa /stackable/opa
-COPY --from=opa-builder --chown=${STACKABLE_USER_UID}:0 /stackable/opa-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable/opa-${PRODUCT}-stackable${RELEASE}-src.tar.gz
+COPY --from=opa-builder --chown=${STACKABLE_USER_UID}:0 /stackable/opa-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable/opa-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz
 COPY --from=multilog-builder --chown=${STACKABLE_USER_UID}:0 /daemontools/admin/daemontools/command/multilog /stackable/multilog
 
 RUN <<EOF
diff --git a/opa/boil-config.toml b/opa/boil-config.toml
new file mode 100644
index 000000000..7f22730c0
--- /dev/null
+++ b/opa/boil-config.toml
@@ -0,0 +1,15 @@
+# Version 1.4.2
+[versions."1.4.2".local-images]
+stackable-devel = "1.0.0"
+vector = "0.47.0"
+
+[versions."1.4.2".build-arguments]
+golang-version = "1.23.9"
+
+# Version 1.0.1
+[versions."1.0.1".local-images]
+stackable-devel = "1.0.0"
+vector = "0.47.0"
+
+[versions."1.0.1".build-arguments]
+golang-version = "1.23.9"
diff --git a/opa/versions.py b/opa/versions.py
deleted file mode 100644
index 64589586a..000000000
--- a/opa/versions.py
+++ /dev/null
@@ -1,14 +0,0 @@
-versions = [
-    {
-        "product": "1.4.2",
-        "vector": "0.47.0",
-        "golang": "1.23.9",
-        "stackable-devel": "1.0.0",
-    },
-    {
-        "product": "1.0.1",
-        "vector": "0.47.0",
-        "golang": "1.23.9",
-        "stackable-devel": "1.0.0",
-    },
-]
diff --git a/opensearch/Dockerfile b/opensearch/Dockerfile
index f684c5441..659c10c91 100644
--- a/opensearch/Dockerfile
+++ b/opensearch/Dockerfile
@@ -1,21 +1,21 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/opensearch/security-plugin AS opensearch-security-plugin
-FROM stackable/image/opensearch/opensearch-prometheus-exporter AS opensearch-prometheus-exporter
-FROM stackable/image/java-devel AS opensearch-builder
-
-ARG PRODUCT
-ARG RELEASE
-ARG OPENSEARCH_SECURITY_PLUGIN
-ARG OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER
+FROM local-image/opensearch/security-plugin AS opensearch-security-plugin
+FROM local-image/opensearch/opensearch-prometheus-exporter AS opensearch-prometheus-exporter
+FROM local-image/java-devel AS opensearch-builder
+
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG OPENSEARCH_SECURITY_PLUGIN_VERSION
+ARG OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
 ARG TARGETARCH
 
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 opensearch/stackable/patches/patchable.toml /stackable/src/opensearch/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 opensearch/stackable/patches/${PRODUCT} /stackable/src/opensearch/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 opensearch/stackable/patches/${PRODUCT_VERSION} /stackable/src/opensearch/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
 microdnf update
@@ -27,50 +27,50 @@ EOF
 USER ${STACKABLE_USER_UID}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout opensearch ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout opensearch ${PRODUCT_VERSION})"
 
 ARCH="${TARGETARCH/amd64/x64}"
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 # Create snapshot of the source code including custom patches
 tar -czf /stackable/opensearch-${NEW_VERSION}-src.tar.gz .
-./scripts/build.sh -v "${PRODUCT}" -s false -a "${ARCH}"
-tar -xzf "artifacts/dist/opensearch-min-${PRODUCT}-linux-${ARCH}.tar.gz" -C /stackable
-unzip artifacts/core-plugins/repository-s3-${PRODUCT}.zip -d /stackable/opensearch-${PRODUCT}/plugins/repository-s3/
-mv /stackable/opensearch-${PRODUCT}/plugins/repository-s3/config /stackable/opensearch-${PRODUCT}/config/repository-s3
-unzip artifacts/core-plugins/telemetry-otel-${PRODUCT}.zip -d /stackable/opensearch-${PRODUCT}/plugins/telemetry-otel/
-mv /stackable/opensearch-${PRODUCT}/plugins/telemetry-otel/config /stackable/opensearch-${PRODUCT}/config/telemetry-otel
+./scripts/build.sh -v "${PRODUCT_VERSION}" -s false -a "${ARCH}"
+tar -xzf "artifacts/dist/opensearch-min-${PRODUCT_VERSION}-linux-${ARCH}.tar.gz" -C /stackable
+unzip artifacts/core-plugins/repository-s3-${PRODUCT_VERSION}.zip -d /stackable/opensearch-${PRODUCT_VERSION}/plugins/repository-s3/
+mv /stackable/opensearch-${PRODUCT_VERSION}/plugins/repository-s3/config /stackable/opensearch-${PRODUCT_VERSION}/config/repository-s3
+unzip artifacts/core-plugins/telemetry-otel-${PRODUCT_VERSION}.zip -d /stackable/opensearch-${PRODUCT_VERSION}/plugins/telemetry-otel/
+mv /stackable/opensearch-${PRODUCT_VERSION}/plugins/telemetry-otel/config /stackable/opensearch-${PRODUCT_VERSION}/config/telemetry-otel
 ./gradlew cyclonedxBom --warning-mode=summary -Dbuild.snapshot=false
-cp distribution/docker/src/docker/bin/docker-entrypoint.sh /stackable/opensearch-${PRODUCT}/opensearch-docker-entrypoint.sh
+cp distribution/docker/src/docker/bin/docker-entrypoint.sh /stackable/opensearch-${PRODUCT_VERSION}/opensearch-docker-entrypoint.sh
 # Tell OpenSearch it is running in a container
-sed -i -e 's/OPENSEARCH_DISTRIBUTION_TYPE=tar/OPENSEARCH_DISTRIBUTION_TYPE=docker/' /stackable/opensearch-${PRODUCT}/bin/opensearch-env
+sed -i -e 's/OPENSEARCH_DISTRIBUTION_TYPE=tar/OPENSEARCH_DISTRIBUTION_TYPE=docker/' /stackable/opensearch-${PRODUCT_VERSION}/bin/opensearch-env
 EOF
 
 WORKDIR /stackable/opensearch-security
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-security-plugin \
-    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN}/build/distributions/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}.zip \
-    opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}.zip
+    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN_VERSION}/build/distributions/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip \
+    opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
 
 RUN <<EOF
-unzip opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}.zip
-rm opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}.zip
-mv config /stackable/opensearch-${PRODUCT}/config/opensearch-security
+unzip opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
+rm opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
+mv config /stackable/opensearch-${PRODUCT_VERSION}/config/opensearch-security
 EOF
 
 WORKDIR /stackable/opensearch-prometheus-exporter
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-prometheus-exporter \
-    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}/build/distributions/prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}.zip \
-    opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}.zip
+    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}/build/distributions/prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}.zip \
+    opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}.zip
 
 RUN <<EOF
-unzip opensearch-prometheus-exporter-${OPENSEARCH_SECURITY_PLUGIN}.zip
-rm opensearch-prometheus-exporter-${OPENSEARCH_SECURITY_PLUGIN}.zip
+unzip opensearch-prometheus-exporter-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
+rm opensearch-prometheus-exporter-${OPENSEARCH_SECURITY_PLUGIN_VERSION}.zip
 EOF
 
-WORKDIR /stackable/opensearch-${PRODUCT}
+WORKDIR /stackable/opensearch-${PRODUCT_VERSION}
 
 RUN <<EOF
 # The JDK from jdk-base is used instead.
@@ -79,19 +79,19 @@ rm -r jdk
 # Change the group permissions already in the builder image to reduce
 # the size of the final image.
 # see https://github.com/stackabletech/docker-images/issues/961
-chmod +x /stackable/opensearch-${PRODUCT}/opensearch-docker-entrypoint.sh
+chmod +x /stackable/opensearch-${PRODUCT_VERSION}/opensearch-docker-entrypoint.sh
 chmod -R g=u /stackable
 EOF
 
 # The OpenSearch Performance Analyzer needs a JDK, not just a JRE.
 # With a JRE, the following exception is thrown:
 # java.lang.ClassNotFoundException: com.sun.tools.attach.VirtualMachine
-FROM stackable/image/jdk-base AS final
+FROM local-image/jdk-base AS final
 
-ARG PRODUCT
-ARG RELEASE
-ARG OPENSEARCH_SECURITY_PLUGIN
-ARG OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG OPENSEARCH_SECURITY_PLUGIN_VERSION
+ARG OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
 
 ARG NAME="OpenSearch"
@@ -103,62 +103,62 @@ LABEL \
   name="OpenSearch" \
   maintainer="info@stackable.tech" \
   vendor="Stackable GmbH" \
-  version="${PRODUCT}" \
-  release="${RELEASE}" \
+  version="${PRODUCT_VERSION}" \
+  release="${RELEASE_VERSION}" \
   summary="The Stackable image for OpenSearch." \
   description="This image is deployed by the Stackable Operator for OpenSearch."
 
 # https://github.com/opencontainers/image-spec/blob/036563a4a268d7c08b51a08f05a02a0fe74c7268/annotations.md#annotations
-LABEL org.opencontainers.image.version="${PRODUCT}"
-LABEL org.opencontainers.image.revision="${RELEASE}"
+LABEL org.opencontainers.image.version="${PRODUCT_VERSION}"
+LABEL org.opencontainers.image.revision="${RELEASE_VERSION}"
 LABEL org.opencontainers.image.title="${NAME}"
 LABEL org.opencontainers.image.description="${DESCRIPTION}"
 
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
-    /stackable/opensearch-${PRODUCT} \
-    /stackable/opensearch-${PRODUCT}-stackable${RELEASE}
+    /stackable/opensearch-${PRODUCT_VERSION} \
+    /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
     /stackable/opensearch-security \
-    /stackable/opensearch-${PRODUCT}-stackable${RELEASE}/plugins/opensearch-security
+    /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugins/opensearch-security
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
     /stackable/opensearch-prometheus-exporter \
-    /stackable/opensearch-${PRODUCT}-stackable${RELEASE}/plugins/prometheus-exporter
+    /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugins/prometheus-exporter
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
-    /stackable/opensearch-${PRODUCT}-stackable${RELEASE}-src.tar.gz \
+    /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz \
     /stackable
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-security-plugin \
-    /stackable/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}-stackable${RELEASE}-src.tar.gz \
+    /stackable/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz \
     /stackable
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-prometheus-exporter \
-    /stackable/opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}-stackable${RELEASE}-src.tar.gz \
+    /stackable/opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz \
     /stackable
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-builder \
-    /stackable/src/opensearch/patchable-work/worktree/${PRODUCT}/build/reports/bom.json \
-    /stackable/opensearch-${PRODUCT}-stackable${RELEASE}.cdx.json
+    /stackable/src/opensearch/patchable-work/worktree/${PRODUCT_VERSION}/build/reports/bom.json \
+    /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-security-plugin \
-    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN}/build/reports/bom.json \
-    /stackable/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN}-stackable${RELEASE}.cdx.json
+    /stackable/src/opensearch/security-plugin/patchable-work/worktree/${OPENSEARCH_SECURITY_PLUGIN_VERSION}/build/reports/bom.json \
+    /stackable/opensearch-security-${OPENSEARCH_SECURITY_PLUGIN_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY \
     --chown=${STACKABLE_USER_UID}:0 \
     --from=opensearch-prometheus-exporter \
-    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}/build/reports/bom.json \
-    /stackable/opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER}-stackable${RELEASE}.cdx.json
+    /stackable/src/opensearch/opensearch-prometheus-exporter/patchable-work/worktree/${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}/build/reports/bom.json \
+    /stackable/opensearch-prometheus-exporter-${OPENSEARCH_OPENSEARCH_PROMETHEUS_EXPORTER_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 
 RUN <<EOF
 microdnf update
@@ -168,12 +168,12 @@ rm -rf /var/cache/yum
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
 chown ${STACKABLE_USER_UID}:0 ${HOME}
-chmod g=u /stackable/opensearch-${PRODUCT}-stackable${RELEASE}
-chmod g=u /stackable/opensearch-${PRODUCT}-stackable${RELEASE}/plugins/opensearch-security
-chmod g=u /stackable/opensearch-${PRODUCT}-stackable${RELEASE}/plugins/prometheus-exporter
+chmod g=u /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+chmod g=u /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugins/opensearch-security
+chmod g=u /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugins/prometheus-exporter
 chmod g=u /stackable/*-src.tar.gz
 chmod g=u /stackable/*.cdx.json
-ln -s /stackable/opensearch-${PRODUCT}-stackable${RELEASE} ${OPENSEARCH_HOME}
+ln -s /stackable/opensearch-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} ${OPENSEARCH_HOME}
 chown -h ${STACKABLE_USER_UID}:0 ${OPENSEARCH_HOME}
 
 # ----------------------------------------
diff --git a/opensearch/boil-config.toml b/opensearch/boil-config.toml
new file mode 100644
index 000000000..cd1e22957
--- /dev/null
+++ b/opensearch/boil-config.toml
@@ -0,0 +1,5 @@
+[versions."3.1.0".local-images]
+java-devel = "21"
+jdk-base = "21"
+"opensearch/security-plugin" = "3.1.0.0"
+"opensearch/opensearch-prometheus-exporter" = "3.1.0.0"
diff --git a/opensearch/opensearch-prometheus-exporter/Dockerfile b/opensearch/opensearch-prometheus-exporter/Dockerfile
index 94554a9c5..6c5696975 100644
--- a/opensearch/opensearch-prometheus-exporter/Dockerfile
+++ b/opensearch/opensearch-prometheus-exporter/Dockerfile
@@ -1,23 +1,23 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-devel AS opensearch-prometheus-exporter-builder
+FROM local-image/java-devel AS opensearch-prometheus-exporter-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 opensearch/opensearch-prometheus-exporter/stackable/patches/patchable.toml /stackable/src/opensearch/opensearch-prometheus-exporter/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 opensearch/opensearch-prometheus-exporter/stackable/patches/${PRODUCT} /stackable/src/opensearch/opensearch-prometheus-exporter/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 opensearch/opensearch-prometheus-exporter/stackable/patches/${PRODUCT_VERSION} /stackable/src/opensearch/opensearch-prometheus-exporter/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout opensearch/opensearch-prometheus-exporter ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout opensearch/opensearch-prometheus-exporter ${PRODUCT_VERSION})"
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/opensearch-prometheus-exporter-${PRODUCT}-stackable${RELEASE}-src.tar.gz .
+tar -czf /stackable/opensearch-prometheus-exporter-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
 ./gradlew clean assemble -Dbuild.snapshot=false
 ./gradlew cyclonedxBom --warning-mode=summary -Dbuild.snapshot=false
 EOF
diff --git a/opensearch/opensearch-prometheus-exporter/boil-config.toml b/opensearch/opensearch-prometheus-exporter/boil-config.toml
new file mode 100644
index 000000000..903a41d47
--- /dev/null
+++ b/opensearch/opensearch-prometheus-exporter/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."3.1.0.0".local-images]
+java-devel = "21"
diff --git a/opensearch/opensearch-prometheus-exporter/versions.py b/opensearch/opensearch-prometheus-exporter/versions.py
deleted file mode 100644
index a46fa4c9f..000000000
--- a/opensearch/opensearch-prometheus-exporter/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "3.1.0.0",
-        "java-devel": "21",
-    },
-]
diff --git a/opensearch/security-plugin/Dockerfile b/opensearch/security-plugin/Dockerfile
index 177d66413..90e661336 100644
--- a/opensearch/security-plugin/Dockerfile
+++ b/opensearch/security-plugin/Dockerfile
@@ -1,23 +1,23 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-devel AS security-plugin-builder
+FROM local-image/java-devel AS security-plugin-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 opensearch/security-plugin/stackable/patches/patchable.toml /stackable/src/opensearch/security-plugin/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 opensearch/security-plugin/stackable/patches/${PRODUCT} /stackable/src/opensearch/security-plugin/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 opensearch/security-plugin/stackable/patches/${PRODUCT_VERSION} /stackable/src/opensearch/security-plugin/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout opensearch/security-plugin ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout opensearch/security-plugin ${PRODUCT_VERSION})"
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/opensearch-security-${PRODUCT}-stackable${RELEASE}-src.tar.gz .
+tar -czf /stackable/opensearch-security-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
 ./gradlew clean assemble -Dbuild.snapshot=false
 ./gradlew cyclonedxBom --warning-mode=summary -Dbuild.snapshot=false
 EOF
diff --git a/opensearch/security-plugin/boil-config.toml b/opensearch/security-plugin/boil-config.toml
new file mode 100644
index 000000000..903a41d47
--- /dev/null
+++ b/opensearch/security-plugin/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."3.1.0.0".local-images]
+java-devel = "21"
diff --git a/opensearch/security-plugin/versions.py b/opensearch/security-plugin/versions.py
deleted file mode 100644
index a46fa4c9f..000000000
--- a/opensearch/security-plugin/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "3.1.0.0",
-        "java-devel": "21",
-    },
-]
diff --git a/opensearch/versions.py b/opensearch/versions.py
deleted file mode 100644
index d35d2027e..000000000
--- a/opensearch/versions.py
+++ /dev/null
@@ -1,9 +0,0 @@
-versions = [
-    {
-        "product": "3.1.0",
-        "java-devel": "21",
-        "jdk-base": "21",
-        "opensearch/security-plugin": "3.1.0.0",
-        "opensearch/opensearch-prometheus-exporter": "3.1.0.0",
-    },
-]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 000000000..291696d0e
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.87.0"
+profile = "default"
diff --git a/rust/boil/Cargo.toml b/rust/boil/Cargo.toml
new file mode 100644
index 000000000..6ae1c39c7
--- /dev/null
+++ b/rust/boil/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "boil"
+version = "0.1.0"
+edition = "2024"
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+publish = false
+
+[dependencies]
+clap.workspace = true
+clap_complete.workspace = true
+git2.workspace = true
+glob.workspace = true
+oci-spec.workspace = true
+semver.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+snafu.workspace = true
+strum.workspace = true
+time.workspace = true
+tokio.workspace = true
+toml.workspace = true
+url.workspace = true
+
+[dev-dependencies]
+rstest.workspace = true
diff --git a/rust/boil/README.md b/rust/boil/README.md
new file mode 100644
index 000000000..35ae3804b
--- /dev/null
+++ b/rust/boil/README.md
@@ -0,0 +1,36 @@
+# boil
+
+boil builds container images in parallel.
+
+- Define versions of container images and version specific values via the `boil-config.toml` file.
+- Refer to local images in Containerfiles via `FROM local-image/...`. Nesting is supported.
+- Structured output is provided for any potential follow-up tasks.
+
+## Quick Overview
+
+Either compile and run the binary, or use the `cargo boil` alias.
+
+```shell
+# Builds all version of the image located in the 'airflow' folder
+boil build airflow
+
+# Builds the 3.0.1 version of the image located in the 'airflow' folder
+boil build airflow=3.0.1
+
+# Builds both the 3.0.1 and 2.10.5 versions of the image located in the
+# 'airflow' folder
+boil build airflow=3.0.1,2.10.5
+
+# Builds all versions of the images located in the 'airflow' and 'opa' folder
+boil build airflow opa
+
+# Display a list of all images and their declared versions as structured JSON
+# output
+boil show images
+
+# Display a list of versions of the image located in the 'airflow' folder
+boil show images airflow
+
+# Soon (hopefully) implemented
+boil show graph
+```
diff --git a/rust/boil/src/build/bakefile.rs b/rust/boil/src/build/bakefile.rs
new file mode 100644
index 000000000..aa85382cc
--- /dev/null
+++ b/rust/boil/src/build/bakefile.rs
@@ -0,0 +1,547 @@
+use std::{
+    collections::BTreeMap,
+    fmt::Debug,
+    ops::{Deref, DerefMut},
+    path::PathBuf,
+};
+
+use glob::glob;
+use oci_spec::image::{
+    ANNOTATION_AUTHORS, ANNOTATION_CREATED, ANNOTATION_DOCUMENTATION, ANNOTATION_LICENSES,
+    ANNOTATION_REVISION, ANNOTATION_SOURCE, ANNOTATION_VENDOR, ANNOTATION_VERSION,
+};
+use semver::Version;
+use serde::Serialize;
+use snafu::{OptionExt, ResultExt, Snafu};
+use time::format_description::well_known::Rfc3339;
+use url::Host;
+
+use crate::{
+    VersionExt,
+    build::{
+        cli,
+        docker::{BuildArgument, BuildArguments, LABEL_BUILD_DATE, ParseBuildArgumentsError},
+        image::{Image, ImageConfig, ImageConfigError, ImageOptions, VersionOptionsPair},
+        platform::TargetPlatform,
+    },
+    config::{self, Config},
+    utils::{format_image_manifest_uri, format_image_repository_uri},
+};
+
+pub const COMMON_TARGET_NAME: &str = "common--target";
+pub const ENTRY_TARGET_NAME_PREFIX: &str = "entry--";
+
+#[derive(Debug, Snafu)]
+pub enum GitError {
+    #[snafu(display("failed to open git repository"))]
+    OpenRepository { source: git2::Error },
+
+    #[snafu(display("failed to parse HEAD revision"))]
+    ParseHeadRevision { source: git2::Error },
+
+    #[snafu(display("failed to find starting point of rev range"))]
+    InvalidRange,
+}
+
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("failed to format current datetime"))]
+    FormatTime { source: time::error::Format },
+
+    #[snafu(display("failed to get revision"))]
+    GetRevision { source: GitError },
+
+    #[snafu(display("failed to create target graph"))]
+    CreateGraph { source: TargetsError },
+
+    #[snafu(display("failed to parse build arguments"))]
+    ParseBuildArguments { source: ParseBuildArgumentsError },
+}
+
+#[derive(Debug, Snafu)]
+pub enum TargetsError {
+    #[snafu(display("encountered invalid image version"))]
+    InvalidImageVersion { source: ImageConfigError },
+
+    #[snafu(display("failed to read image config"))]
+    ReadImageConfig { source: ImageConfigError },
+}
+
+#[derive(Debug, Default)]
+pub struct TargetsOptions {
+    pub only_entry: bool,
+}
+
+/// Contains targets selected by the user.
+///
+/// This is a map which uses the image/target name as the key. Each key points to another map,
+/// which contains one entry per version of the target. Each value contains the image options and
+/// a boolean flag to indicate if this target is an entry target.
+#[derive(Debug, Default)]
+pub struct Targets(BTreeMap<String, BTreeMap<String, (ImageOptions, bool)>>);
+
+impl Deref for Targets {
+    type Target = BTreeMap<String, BTreeMap<String, (ImageOptions, bool)>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for Targets {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl IntoIterator for Targets {
+    type IntoIter =
+        std::collections::btree_map::IntoIter<String, BTreeMap<String, (ImageOptions, bool)>>;
+    type Item = (String, BTreeMap<String, (ImageOptions, bool)>);
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl Targets {
+    /// Returns a map of all targets by globbing for (nested) image config files.
+    ///
+    /// The search behaviour can be customized using the provided [`TargetsOptions`].
+    pub fn all(options: TargetsOptions) -> Result<Self, TargetsError> {
+        let image_config_paths = glob(ImageConfig::ALL_CONFIGS_GLOB_PATTERN)
+            .expect("glob pattern must be valid")
+            .filter_map(Result::ok);
+
+        let mut targets = Self::default();
+
+        for image_config_path in image_config_paths {
+            let image_config =
+                ImageConfig::from_file(&image_config_path).context(ReadImageConfigSnafu)?;
+
+            let image_name = image_config_path
+                .parent()
+                .expect("there must be a parent")
+                .to_string_lossy()
+                .into_owned();
+
+            let pairs = image_config.all();
+
+            targets.insert_targets(image_name.to_owned(), pairs, &options, true)?;
+        }
+
+        Ok(targets)
+    }
+
+    /// Returns a filtered set out of all targets by looking up selected image config files.
+    ///
+    /// The search behaviour can be customized using the provided [`TargetsOptions`].
+    pub fn set(images: &[Image], options: TargetsOptions) -> Result<Self, TargetsError> {
+        let mut targets = Self::default();
+
+        for image in images {
+            // TODO (@Techassi): We should instead build the graph based on the Dockerfile(s),
+            // because this is the source of truth and what ultimately gets built. The boil config
+            // files are not a source a truth, but just provide data needed during the build.
+            let image_config_path = PathBuf::new()
+                .join(&image.name)
+                .join(ImageConfig::DEFAULT_FILE_NAME);
+
+            // Read the image config which defines supported image versions and their dependencies as
+            // well as other values.
+            let image_config =
+                ImageConfig::from_file(image_config_path).context(ReadImageConfigSnafu)?;
+
+            // Create a list of image versions we need to generate targets for in the bakefile.
+            let pairs = image_config
+                .filter_by_version(&image.versions)
+                .context(InvalidImageVersionSnafu)?;
+
+            targets.insert_targets(image.name.clone(), pairs, &options, true)?;
+        }
+
+        Ok(targets)
+    }
+
+    fn insert_targets(
+        &mut self,
+        image_name: String,
+        pairs: Vec<VersionOptionsPair>,
+        options: &TargetsOptions,
+        is_entry: bool,
+    ) -> Result<(), TargetsError> {
+        for VersionOptionsPair {
+            version: image_version,
+            options: image_options,
+        } in pairs
+        {
+            if !options.only_entry {
+                // TODO (@Techassi): Add cycle detection
+                for (image_name, image_version) in &image_options.local_images {
+                    if self
+                        .get(image_name)
+                        .is_some_and(|image_versions| image_versions.contains_key(image_version))
+                    {
+                        continue;
+                    }
+
+                    let image_config_path = PathBuf::new()
+                        .join(image_name)
+                        .join(ImageConfig::DEFAULT_FILE_NAME);
+
+                    let image_config =
+                        ImageConfig::from_file(image_config_path).context(ReadImageConfigSnafu)?;
+
+                    let pairs = image_config
+                        .filter_by_version(&[image_version])
+                        .context(InvalidImageVersionSnafu)?;
+
+                    // Wowzers, recursion!
+                    self.insert_targets(image_name.clone(), pairs, options, false)?;
+                }
+            }
+
+            self.entry(image_name.clone())
+                .or_default()
+                .insert(image_version, (image_options, is_entry));
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Debug, Default, Serialize)]
+pub struct Bakefile {
+    #[serde(rename = "group")]
+    pub groups: BTreeMap<String, BakefileGroup>,
+
+    #[serde(rename = "target")]
+    pub targets: BTreeMap<String, BakefileTarget>,
+}
+
+impl Bakefile {
+    /// Create a bakefile from the [`BuildArguments`](cli::BuildArguments) provided via the CLI.
+    ///
+    /// This will only create targets for selected entry images and their dependencies. There is no
+    /// need to filter anything out afterwards. The filtering is done automatically internally.
+    pub fn from_args(args: &cli::BuildArguments, config: Config) -> Result<Self, Error> {
+        let targets =
+            Targets::set(&args.images, TargetsOptions::default()).context(CreateGraphSnafu)?;
+        Self::from_targets(targets, args, config)
+    }
+
+    /// Returns all image manifest URIs for entry images.
+    pub fn image_manifest_uris(&self) -> Vec<&str> {
+        self.targets
+            .iter()
+            // We only care about the entry targets, because those are the primary images boil
+            // builds.
+            .filter(|(target_name, _)| target_name.starts_with(ENTRY_TARGET_NAME_PREFIX))
+            // The image manifest URIs file only contains the image tags
+            .flat_map(|(_, target)| &target.tags)
+            // Flatten multiple tags (boil currently only ever writes a single one, but the data
+            // structure can accept a list).
+            .map(|s| s.as_str())
+            .collect()
+    }
+
+    /// Creates the common target, containing shared data, which will be inherited by other targets.
+    fn common_target(args: &cli::BuildArguments, config: Config) -> Result<BakefileTarget, Error> {
+        let revision = Self::git_head_revision().context(GetRevisionSnafu)?;
+        let date_time = Self::now()?;
+
+        // Load build arguments from a file if the user requested it
+        let mut build_arguments = args.build_arguments.clone();
+        if let Some(path) = &args.build_arguments_file {
+            let build_arguments_from_file =
+                BuildArguments::from_file(path).context(ParseBuildArgumentsSnafu)?;
+            build_arguments.extend(build_arguments_from_file);
+        }
+
+        let target = BakefileTarget::common(
+            date_time,
+            revision,
+            config,
+            build_arguments,
+            args.image_version.base_prerelease(),
+        );
+
+        Ok(target)
+    }
+
+    fn from_targets(
+        targets: Targets,
+        args: &cli::BuildArguments,
+        config: Config,
+    ) -> Result<Self, Error> {
+        let mut bakefile_targets = BTreeMap::new();
+        let mut groups: BTreeMap<String, BakefileGroup> = BTreeMap::new();
+
+        // Create a common target, which contains shared data, like annotations, arguments, labels, etc...
+        let common_target = Self::common_target(args, config)?;
+        bakefile_targets.insert(COMMON_TARGET_NAME.to_owned(), common_target);
+
+        for (image_name, image_versions) in targets.into_iter() {
+            for (image_version, (image_options, is_entry)) in image_versions {
+                // TODO (@Techassi): Clean this up
+                // TODO (@Techassi): Move the arg formatting into functions
+                let mut build_arguments = BuildArguments::new();
+
+                let local_version_docker_args: Vec<_> = image_options
+                    .local_images
+                    .iter()
+                    .map(|(image_name, image_version)| {
+                        BuildArgument::new(
+                            format!(
+                                "{image_name}_VERSION",
+                                image_name = image_name.to_uppercase().replace('-', "_")
+                            ),
+                            image_version.to_string(),
+                        )
+                    })
+                    .collect();
+
+                build_arguments.extend(image_options.build_arguments);
+                build_arguments.extend(local_version_docker_args);
+                // TODO (@Techassi): Rename this to IMAGE_VERSION
+                build_arguments.insert(BuildArgument::new(
+                    "PRODUCT_VERSION".to_owned(),
+                    image_version.to_string(),
+                ));
+
+                // The image registry, eg. `oci.stackable.tech` or `localhost`
+                let image_registry = if args.use_localhost_registry {
+                    &Host::Domain(String::from("localhost"))
+                } else {
+                    &args.registry
+                };
+
+                let image_repository_uri = format_image_repository_uri(
+                    image_registry,
+                    &args.registry_namespace,
+                    &image_name,
+                );
+
+                let image_manifest_uri = format_image_manifest_uri(
+                    &image_repository_uri,
+                    &image_version,
+                    &args.image_version,
+                    args.target_platform.architecture(),
+                    args.strip_architecture,
+                );
+
+                let dockerfile = PathBuf::new()
+                    .join(&image_name)
+                    .join(&args.target_containerfile);
+
+                let target_name = if is_entry {
+                    Self::format_entry_target_name(&image_name, &image_version)
+                } else {
+                    Self::format_target_name(&image_name, &image_version)
+                };
+
+                let contexts: BTreeMap<_, _> = image_options
+                    .local_images
+                    .iter()
+                    .map(|(image_name, image_version)| {
+                        let context_name = Self::format_context_name(image_name);
+                        let context_target = Self::format_context_target(image_name, image_version);
+
+                        (context_name, context_target)
+                    })
+                    .collect();
+
+                let annotations =
+                    BakefileTarget::image_version_annotation(&image_version, &args.image_version);
+
+                let target = BakefileTarget {
+                    tags: vec![image_manifest_uri],
+                    arguments: build_arguments,
+                    platforms: vec![args.target_platform.clone()],
+                    // NOTE (@Techassi): Should this instead be scoped to the folder of the image we build
+                    context: Some(PathBuf::from(".")),
+                    dockerfile: Some(dockerfile),
+                    inherits: vec![COMMON_TARGET_NAME.to_owned()],
+                    annotations,
+                    contexts,
+                    ..Default::default()
+                };
+
+                bakefile_targets.insert(target_name, target);
+
+                // Add the target to the default group if it is an entry
+                if is_entry {
+                    groups
+                        .entry("default".to_owned())
+                        .or_default()
+                        .targets
+                        .push(Self::format_entry_target_name(&image_name, &image_version));
+                }
+            }
+        }
+
+        Ok(Self {
+            targets: bakefile_targets,
+            groups,
+        })
+    }
+
+    /// Formats and returns the entry target name, eg. `entry--opa-1_4_2`.
+    fn format_entry_target_name(image_name: &str, image_version: &str) -> String {
+        let target_name = Self::format_target_name(image_name, image_version);
+        format!("{ENTRY_TARGET_NAME_PREFIX}{target_name}")
+    }
+
+    /// Formats and returns the target name, eg. `stackable-base-1_0_0`.
+    fn format_target_name(image_name: &str, image_version: &str) -> String {
+        // Replace any slashes from nested image names, eg. shared/protobuf, because docker buildx
+        // has this weird restriction (because it also supports push, which we do on our own). We
+        // are therefore artificially limited what target names we can use: [a-zA-Z0-9_-]+
+        let image_name = image_name.replace('/', "__");
+
+        // The dots in the semantic version also need to be replaced.
+        let image_version = image_version.replace('.', "_");
+
+        format!("{image_name}-{image_version}")
+    }
+
+    /// Formats and return the context name, eg. `stackable/image/stackable-base-1_0_0`.
+    fn format_context_name(name: &str) -> String {
+        format!("local-image/{name}")
+    }
+
+    /// Formats and returns the context target name, eg. `target:stackable-base-1_0_0`.
+    fn format_context_target(name: &str, version: &str) -> String {
+        let target_name = Self::format_target_name(name, version);
+        format!("target:{target_name}")
+    }
+
+    fn now() -> Result<String, Error> {
+        time::UtcDateTime::now()
+            .format(&Rfc3339)
+            .context(FormatTimeSnafu)
+    }
+
+    fn git_head_revision() -> Result<String, GitError> {
+        let repo = git2::Repository::open(".").context(OpenRepositorySnafu)?;
+        let rev = repo.revparse("HEAD").context(ParseHeadRevisionSnafu)?;
+        let rev = rev.from().context(InvalidRangeSnafu)?.id().to_string();
+
+        Ok(rev)
+    }
+}
+
+// TODO (@Techassi): Figure out of we can use borrowed data in here. This would avoid a whole bunch
+// of cloning.
+#[derive(Debug, Default, Serialize)]
+pub struct BakefileTarget {
+    /// Defines build arguments for the target.
+    #[serde(rename = "args", skip_serializing_if = "BuildArguments::is_empty")]
+    pub arguments: BuildArguments,
+
+    /// Adds annotations to images built with bake.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub annotations: Vec<String>,
+
+    /// Specifies the location of the build context to use for this target.
+    ///
+    /// Accepts a URL or a directory path.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub context: Option<PathBuf>,
+
+    /// Additional build contexts.
+    ///
+    /// This attribute takes a map, where keys result in named contexts that you can reference in
+    /// your builds.
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub contexts: BTreeMap<String, String>,
+
+    /// Name of the Dockerfile to use for the build.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub dockerfile: Option<PathBuf>,
+
+    /// A target can inherit attributes from other targets.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub inherits: Vec<String>,
+
+    /// Assigns image labels to the build.
+    #[serde(skip_serializing_if = "BTreeMap::is_empty")]
+    pub labels: BTreeMap<String, String>,
+
+    // TODO (@Techassi): Explore how we can build multiple platforms at once
+    /// Set target platforms for the build target.
+    ///
+    /// Technically, multiple architectures can be listed in here, but boil chooses to build only
+    /// one architecture at a time.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub platforms: Vec<TargetPlatform>,
+
+    /// Image names and tags to use for the build target.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub tags: Vec<String>,
+}
+
+impl BakefileTarget {
+    fn common(
+        date_time: String,
+        revision: String,
+        config: Config,
+        build_arguments: Vec<BuildArgument>,
+        release_version: String,
+    ) -> Self {
+        let config::Metadata {
+            documentation,
+            licenses,
+            authors,
+            source,
+            vendor,
+        } = config.metadata;
+
+        // Annotations describe OCI image components.
+        let annotations = vec![
+            format!("{ANNOTATION_CREATED}={date_time}"),
+            format!("{ANNOTATION_AUTHORS}={authors}"),
+            format!("{ANNOTATION_DOCUMENTATION}={documentation}"),
+            format!("{ANNOTATION_SOURCE}={source}"),
+            format!("{ANNOTATION_REVISION}={revision}"),
+            format!("{ANNOTATION_VENDOR}={vendor}"),
+            format!("{ANNOTATION_LICENSES}={licenses}"),
+        ];
+
+        let mut arguments = config.build_arguments;
+        arguments.extend(build_arguments);
+        arguments.insert(BuildArgument::new(
+            "RELEASE_VERSION".to_owned(),
+            release_version,
+        ));
+
+        // Labels describe Docker resources, and con be considered legacy. We
+        // should use annotations instead. These labels are only added to be
+        // consistent with `bake`.
+        let labels = BTreeMap::from([
+            (ANNOTATION_CREATED.to_owned(), date_time.clone()),
+            (ANNOTATION_REVISION.to_owned(), revision),
+            (LABEL_BUILD_DATE.to_owned(), date_time),
+        ]);
+
+        Self {
+            annotations,
+            arguments,
+            labels,
+            ..Default::default()
+        }
+    }
+
+    fn image_version_annotation(image_version: &str, sdp_image_version: &Version) -> Vec<String> {
+        vec![
+            // TODO (@Techassi): Move this version formatting into a function
+            // TODO (@Techassi): Make this vendor agnostic, don't hard-code stackable here
+            format!("{ANNOTATION_VERSION}={image_version}-stackable{sdp_image_version}"),
+        ]
+    }
+}
+
+#[derive(Debug, Default, Serialize)]
+pub struct BakefileGroup {
+    targets: Vec<String>,
+}
diff --git a/rust/boil/src/build/cli.rs b/rust/boil/src/build/cli.rs
new file mode 100644
index 000000000..35756fcc0
--- /dev/null
+++ b/rust/boil/src/build/cli.rs
@@ -0,0 +1,151 @@
+use std::{path::PathBuf, str::FromStr};
+
+use clap::{Args, ValueHint, value_parser};
+use semver::Version;
+use snafu::{ResultExt, Snafu, ensure};
+use url::Host;
+
+use crate::build::{
+    docker::BuildArgument,
+    image::Image,
+    platform::{Architecture, TargetPlatform},
+};
+
+#[derive(Debug, Args)]
+pub struct BuildArguments {
+    /// The image(s) which should be build. The format is name[=version,...].
+    #[arg(help_heading = "Image Options", required = true)]
+    pub images: Vec<Image>,
+
+    // The action currently does the wrong thing here. It includes the
+    // architecture even though it should come from the --target-platform arg.
+    // The release arg is NOT needed, because this version IS the release version.
+    /// The image version being built.
+    #[arg(
+        short, long,
+        value_parser = parse_image_version,
+        default_value_t = Self::default_image_version(),
+        help_heading = "Image Options"
+    )]
+    pub image_version: Version,
+
+    /// Target platform of the image.
+    #[arg(
+        short, long,
+        short_alias = 'a', alias = "architecture",
+        default_value_t = Self::default_architecture(),
+        help_heading = "Image Options"
+    )]
+    pub target_platform: TargetPlatform,
+
+    /// Image registry used in image manifests, URIs, and tags.
+    #[arg(
+        short, long,
+        default_value_t = Self::default_registry(),
+        value_parser = Host::parse,
+        value_hint = ValueHint::Hostname,
+        help_heading = "Registry Options"
+    )]
+    pub registry: Host,
+
+    /// The namespace within the given registry.
+    #[arg(
+        short = 'n',
+        long = "registry-namespace",
+        alias = "organization",
+        default_value = "sdp",
+        help_heading = "Registry Options"
+    )]
+    pub registry_namespace: String,
+
+    /// Use 'localhost' as the registry instead of <REGISTRY> to avoid any accidental interactions
+    /// with remote registries.
+    ///
+    /// This is especially useful in CI, which can re-tag the image before pushing it.
+    #[arg(long, help_heading = "Registry Options")]
+    pub use_localhost_registry: bool,
+
+    /// Override the target containerfile used, points to <IMAGE>/<TARGET_CONTAINERFILE>.
+    #[arg(
+        long,
+        default_value_os_t = Self::default_target_containerfile(),
+        value_hint = ValueHint::FilePath,
+        help_heading = "Build Options"
+    )]
+    pub target_containerfile: PathBuf,
+
+    /// Override build arguments, in key=value format. The key is case insensitive. This argument
+    /// can be supplied multiple times.
+    #[arg(
+        long = "build-argument",
+        alias = "build-arg",
+        value_name = "BUILD_ARGUMENT",
+        help_heading = "Build Options"
+    )]
+    pub build_arguments: Vec<BuildArgument>,
+
+    /// Load and override build arguments, in key=value format, each separated by a newline from the
+    /// specified file.
+    #[arg(long, alias = "build-args-file", help_heading = "Build Options")]
+    pub build_arguments_file: Option<PathBuf>,
+
+    /// Write target image tags to <EXPORT_FILE>. Useful for signing or other follow-up CI steps.
+    #[arg(
+        long,
+        alias = "export-tags-file",
+        help_heading = "Build Options",
+        value_name = "FILE",
+        value_hint = ValueHint::FilePath,
+        value_parser = value_parser!(PathBuf),
+        default_missing_value = "boil-target-tags",
+        num_args(0..=1)
+    )]
+    pub write_image_manifest_uris: Option<PathBuf>,
+
+    /// Strips the architecture from the image (index) manifest tag.
+    #[arg(long, help_heading = "Build Options")]
+    pub strip_architecture: bool,
+
+    /// Loads the image into the local image store.
+    #[arg(long, help_heading = "Build Options")]
+    pub load: bool,
+
+    /// Dry run. This does not build the image(s) but instead prints out the bakefile.
+    #[arg(short, long, alias = "dry")]
+    pub dry_run: bool,
+}
+
+impl BuildArguments {
+    fn default_image_version() -> Version {
+        "0.0.0-dev".parse().expect("must be a valid SemVer")
+    }
+
+    // TODO: Auto-detect this
+    fn default_architecture() -> TargetPlatform {
+        TargetPlatform::Linux(Architecture::Amd64)
+    }
+
+    fn default_registry() -> Host {
+        Host::Domain(String::from("oci.stackable.tech"))
+    }
+
+    fn default_target_containerfile() -> PathBuf {
+        PathBuf::from("Dockerfile")
+    }
+}
+
+#[derive(Debug, Snafu)]
+pub enum ParseImageVersionError {
+    #[snafu(display("failed to parse semantic version"))]
+    ParseVersion { source: semver::Error },
+
+    #[snafu(display("semantic version must not contain build metadata"))]
+    ContainsBuildMetadata,
+}
+
+pub fn parse_image_version(input: &str) -> Result<Version, ParseImageVersionError> {
+    let version = Version::from_str(input).context(ParseVersionSnafu)?;
+    ensure!(version.build.is_empty(), ContainsBuildMetadataSnafu);
+
+    Ok(version)
+}
diff --git a/rust/boil/src/build/docker.rs b/rust/boil/src/build/docker.rs
new file mode 100644
index 000000000..23e524f1c
--- /dev/null
+++ b/rust/boil/src/build/docker.rs
@@ -0,0 +1,199 @@
+use std::{
+    collections::BTreeSet,
+    fmt::Display,
+    ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+use serde::{Deserialize, Serialize, de::Visitor, ser::SerializeMap};
+use snafu::{OptionExt, ResultExt, Snafu, ensure};
+
+/// Label key for the date and time on which the image was built.
+pub const LABEL_BUILD_DATE: &str = "build-date";
+
+#[derive(Debug, Snafu)]
+pub enum ParseBuildArgumentError {
+    #[snafu(display("invalid format, expected <key>=<value>"))]
+    InvalidFormat,
+
+    #[snafu(display("encountered non ASCII characters"))]
+    NonAscii,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct BuildArgument((String, String));
+
+impl BuildArgument {
+    pub fn new(key: String, value: String) -> Self {
+        let key = Self::format_key(key);
+        Self((key, value))
+    }
+
+    fn format_key(key: impl AsRef<str>) -> String {
+        key.as_ref().replace(['-', '/'], "_").to_uppercase()
+    }
+}
+
+impl FromStr for BuildArgument {
+    type Err = ParseBuildArgumentError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        ensure!(s.is_ascii(), NonAsciiSnafu);
+
+        let (key, value) = s.split_once('=').context(InvalidFormatSnafu)?;
+        let key = Self::format_key(key);
+
+        Ok(Self((key, value.to_owned())))
+    }
+}
+
+impl<'de> Deserialize<'de> for BuildArgument {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct BuildArgumentVisitor;
+
+        impl Visitor<'_> for BuildArgumentVisitor {
+            type Value = BuildArgument;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(formatter, "a valid build argument")
+            }
+
+            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                BuildArgument::from_str(v).map_err(serde::de::Error::custom)
+            }
+        }
+
+        deserializer.deserialize_str(BuildArgumentVisitor)
+    }
+}
+
+impl Display for BuildArgument {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let (key, value) = &self.0;
+        write!(f, "{key}={value}")
+    }
+}
+
+#[derive(Debug, Snafu)]
+pub enum ParseBuildArgumentsError {
+    #[snafu(display("failed to read file at {path}", path = path.display()))]
+    ReadFile {
+        source: std::io::Error,
+        path: PathBuf,
+    },
+
+    #[snafu(display("failed to parse build argument"))]
+    ParseBuildArgument { source: ParseBuildArgumentError },
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct BuildArguments(BTreeSet<BuildArgument>);
+
+impl Deref for BuildArguments {
+    type Target = BTreeSet<BuildArgument>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for BuildArguments {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl Extend<BuildArgument> for BuildArguments {
+    fn extend<T: IntoIterator<Item = BuildArgument>>(&mut self, iter: T) {
+        self.0.extend(iter);
+    }
+}
+
+impl IntoIterator for BuildArguments {
+    type IntoIter = std::collections::btree_set::IntoIter<Self::Item>;
+    type Item = BuildArgument;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<'de> Deserialize<'de> for BuildArguments {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct BuildArgumentsVisitor;
+
+        impl<'de> Visitor<'de> for BuildArgumentsVisitor {
+            type Value = BuildArguments;
+
+            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(formatter, "a map of valid build arguments")
+            }
+
+            fn visit_map<A>(self, mut map: A) -> Result<Self::Value, A::Error>
+            where
+                A: serde::de::MapAccess<'de>,
+            {
+                let mut args = BTreeSet::new();
+
+                while let Some((key, value)) = map.next_entry()? {
+                    args.insert(BuildArgument::new(key, value));
+                }
+
+                Ok(BuildArguments(args))
+            }
+        }
+
+        deserializer.deserialize_map(BuildArgumentsVisitor)
+    }
+}
+
+impl Serialize for BuildArguments {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut map = serializer.serialize_map(Some(self.len()))?;
+
+        for BuildArgument((key, value)) in &self.0 {
+            map.serialize_entry(&key, &value)?;
+        }
+
+        map.end()
+    }
+}
+
+impl BuildArguments {
+    pub fn new() -> Self {
+        Self(BTreeSet::new())
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    pub fn from_file<P>(path: P) -> Result<Self, ParseBuildArgumentsError>
+    where
+        P: AsRef<Path>,
+    {
+        let path = path.as_ref();
+        let content = std::fs::read_to_string(path).context(ReadFileSnafu { path })?;
+        let mut args = Self::new();
+
+        for line in content.lines() {
+            let arg = BuildArgument::from_str(line).context(ParseBuildArgumentSnafu)?;
+            args.insert(arg);
+        }
+
+        Ok(args)
+    }
+}
diff --git a/rust/boil/src/build/image.rs b/rust/boil/src/build/image.rs
new file mode 100644
index 000000000..fda888e65
--- /dev/null
+++ b/rust/boil/src/build/image.rs
@@ -0,0 +1,234 @@
+use std::{
+    collections::BTreeMap,
+    fmt::Display,
+    ops::Deref,
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+use serde::Deserialize;
+use snafu::{ResultExt as _, Snafu, ensure};
+
+use crate::{IfContext, build::docker::BuildArguments};
+
+#[derive(Debug, PartialEq, Snafu)]
+pub enum ParseImageError {
+    #[snafu(display("input must not be empty"))]
+    EmptyInput,
+
+    #[snafu(display("encountered invalid format, expected name[=version,...]"))]
+    InvalidFormat,
+
+    #[snafu(display("the path contains unsupported characters: '.' or '~'"))]
+    UnsupportedChars,
+
+    #[snafu(display("absolute paths are not supported"))]
+    AbsolutePath,
+}
+
+#[derive(Clone, Debug)]
+pub struct Image {
+    pub name: String,
+    pub versions: Vec<String>,
+}
+
+impl FromStr for Image {
+    type Err = ParseImageError;
+
+    fn from_str(input: &str) -> Result<Self, Self::Err> {
+        // Get rid of any leading and traling whitespace
+        let input = input.trim();
+        ensure!(!input.is_empty(), EmptyInputSnafu);
+
+        let parts: Vec<_> = input.split('=').collect();
+
+        // Ensure that the path/image name is not empty, doesn't contain '~', and is not abolute.
+        ensure!(!parts[0].is_empty(), InvalidFormatSnafu);
+        ensure!(!parts[0].contains('~'), UnsupportedCharsSnafu);
+        ensure!(!parts[0].starts_with('/'), AbsolutePathSnafu);
+
+        // Get rid of a leading ./ from the image name. This would need to be replaced, because
+        // Docker doesn't allow dots in various places (like target names). Additionally, it would
+        // clutter the different names. The same applies for a trailing slash.
+        let image_name = parts[0]
+            .trim_start_matches("./")
+            .trim_end_matches('/')
+            .to_owned();
+
+        match parts.len() {
+            1 => Ok(Self::new_unversioned(image_name)),
+            2 => {
+                // Ensure that the version part is not empty
+                ensure!(!parts[1].is_empty(), InvalidFormatSnafu);
+
+                let versions: Vec<_> = parts[1].split(',').map(ToOwned::to_owned).collect();
+                Ok(Self::new(image_name, versions))
+            }
+            _ => InvalidFormatSnafu.fail(),
+        }
+    }
+}
+
+impl Display for Image {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if self.versions.is_empty() {
+            f.write_str(&self.name)
+        } else {
+            write!(
+                f,
+                "{name}={versions}",
+                name = self.name,
+                versions = self.versions.join(",")
+            )
+        }
+    }
+}
+
+impl Image {
+    fn new(name: String, versions: Vec<String>) -> Self {
+        Self { name, versions }
+    }
+
+    fn new_unversioned(name: String) -> Self {
+        Self {
+            name,
+            versions: vec![],
+        }
+    }
+}
+
+#[derive(Debug, Snafu)]
+pub enum ImageConfigError {
+    #[snafu(display("failed to read config file at {path}", path = path.display()))]
+    ReadFile {
+        source: std::io::Error,
+        path: PathBuf,
+    },
+
+    #[snafu(display("failed to deserialize config file from TOML"))]
+    Deserialize { source: toml::de::Error },
+
+    #[snafu(display("provided filter version yielded empty list"))]
+    EmptyFilter,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ImageConfig {
+    // TODO (@Techassi): Eventually support this
+    // #[serde(default)]
+    // pub metadata: ImageMetadata,
+    pub versions: ImageVersions,
+}
+
+impl ImageConfig {
+    /// This glob pattern matches all (deeply nested) image configs.
+    pub const ALL_CONFIGS_GLOB_PATTERN: &str = "**/boil-config.toml";
+    /// The default image config file name.
+    pub const DEFAULT_FILE_NAME: &str = "boil-config.toml";
+
+    pub fn filter_by_version<V>(
+        self,
+        versions: &[V],
+    ) -> Result<Vec<VersionOptionsPair>, ImageConfigError>
+    where
+        V: AsRef<str> + PartialEq,
+    {
+        let versions: Vec<_> = self
+            .pairs()
+            .filter(|(image_version, _)| {
+                versions.is_empty() || versions.iter().any(|v| v.as_ref() == image_version)
+            })
+            .map(Into::into)
+            .collect();
+
+        versions.if_context(|v| !v.is_empty(), EmptyFilterSnafu)
+    }
+
+    pub fn all(self) -> Vec<VersionOptionsPair> {
+        self.pairs().map(Into::into).collect()
+    }
+
+    fn pairs(self) -> impl Iterator<Item = (String, ImageOptions)> {
+        self.versions.0.into_iter()
+    }
+}
+
+impl ImageConfig {
+    pub fn from_file(path: impl AsRef<Path>) -> Result<Self, ImageConfigError> {
+        let path = path.as_ref();
+        let contents = std::fs::read_to_string(path).with_context(|_| ReadFileSnafu { path })?;
+        toml::from_str(&contents).context(DeserializeSnafu)
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ImageVersions(BTreeMap<String, ImageOptions>);
+
+impl Deref for ImageVersions {
+    type Target = BTreeMap<String, ImageOptions>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct ImageOptions {
+    #[serde(default)]
+    pub local_images: BTreeMap<String, String>,
+
+    // NOTE (@Techassi): Potentially add a dependencies field here which will be automatically be
+    // suffixed with _VERSION.
+    #[serde(default)]
+    pub build_arguments: BuildArguments,
+}
+
+#[derive(Debug)]
+pub struct VersionOptionsPair {
+    pub version: String,
+    pub options: ImageOptions,
+}
+
+impl From<(String, ImageOptions)> for VersionOptionsPair {
+    fn from(value: (String, ImageOptions)) -> Self {
+        VersionOptionsPair {
+            version: value.0,
+            options: value.1,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use rstest::rstest;
+
+    use super::*;
+
+    #[rstest]
+    #[case("my/image/in.a/folder/with/name=1.2.3-rc.1,4.5.6-rc.2", &["1.2.3-rc.1", "4.5.6-rc.2"])]
+    #[case("my/image/in.a/folder/with/name=1.2.3-rc.1", &["1.2.3-rc.1"])]
+    #[case("my.image.in.a.folder.with/name=1.2.3", &["1.2.3"])]
+    #[case("my/image/in.a/folder/with/name", &[])]
+    #[case("my.image.in.a.folder.with/name", &[])]
+    #[case("my/image/with/name=1.2.3", &["1.2.3"])]
+    #[case("my/image/with/name", &[])]
+    #[case("name=1.2.3", &["1.2.3"])]
+    #[case("name", &[])]
+    fn valid(#[case] input: &str, #[case] expected_versions: &[&str]) {
+        let Image { versions, .. } = Image::from_str(input).expect("must be a valid image");
+        assert_eq!(versions, expected_versions);
+    }
+
+    #[rstest]
+    #[case("double/equal/image=1.2.3=4.5.6", ParseImageError::InvalidFormat)]
+    #[case("~/image/folder/with/tilde", ParseImageError::UnsupportedChars)]
+    #[case("/absolute/image/folder", ParseImageError::AbsolutePath)]
+    #[case("empty/version/image=", ParseImageError::InvalidFormat)]
+    #[case("   ", ParseImageError::EmptyInput)]
+    #[case("", ParseImageError::EmptyInput)]
+    fn invalid(#[case] input: &str, #[case] expected_error: ParseImageError) {
+        let error = Image::from_str(input).expect_err("invalid image must not parse");
+        assert_eq!(error, expected_error);
+    }
+}
diff --git a/rust/boil/src/build/mod.rs b/rust/boil/src/build/mod.rs
new file mode 100644
index 000000000..6373c2c8e
--- /dev/null
+++ b/rust/boil/src/build/mod.rs
@@ -0,0 +1,112 @@
+use std::{
+    fmt::Debug,
+    process::{Command, Stdio},
+};
+
+use snafu::{OptionExt, ResultExt, Snafu, ensure};
+
+use crate::{
+    build::{bakefile::Bakefile, cli::BuildArguments},
+    config::Config,
+    utils::CommandExt,
+};
+
+pub mod bakefile;
+pub mod cli;
+pub mod docker;
+pub mod image;
+pub mod platform;
+
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("failed to create bakefile"))]
+    CreateBakefile { source: bakefile::Error },
+
+    #[snafu(display("failed to write image manifest URIs to file"))]
+    WriteImageManifestUrisFile { source: std::io::Error },
+
+    #[snafu(display("failed to serialize bakefile as JSON"))]
+    SerializeBakefile { source: serde_json::Error },
+
+    #[snafu(display("failed to acquire stdin handle"))]
+    AcquireStdinHandle,
+
+    #[snafu(display("failed to run child process"))]
+    RunChildProcess { source: std::io::Error },
+
+    #[snafu(display("failed to spawn child process"))]
+    SpawnChildProcess { source: std::io::Error },
+
+    #[snafu(display("encountered invalid image version, must not include any build metadata"))]
+    InvalidImageVersion,
+}
+
+/// This is the `boil build` command handler function.
+pub fn run_command(args: BuildArguments, config: Config) -> Result<(), Error> {
+    // TODO (@Techassi): Parse Dockerfile instead to build the target graph
+    // Validation
+    ensure!(
+        args.image_version.build.is_empty(),
+        InvalidImageVersionSnafu
+    );
+
+    // Create bakefile
+    let bakefile = Bakefile::from_args(&args, config).context(CreateBakefileSnafu)?;
+    let image_manifest_uris = bakefile.image_manifest_uris();
+    let count = image_manifest_uris.len();
+
+    // Write the image manifest URIs to file if requested
+    if let Some(path) = args.write_image_manifest_uris {
+        std::fs::write(path, image_manifest_uris.join("\n"))
+            .context(WriteImageManifestUrisFileSnafu)?;
+    }
+
+    // Output the bakefile contents if in dry-run mode
+    if args.dry_run {
+        return serde_json::to_writer_pretty(std::io::stdout(), &bakefile)
+            .context(SerializeBakefileSnafu);
+    }
+
+    // TODO (@Techassi): Invoke this directly using the Docker daemon via bollard
+    // or by building the image ourself.
+
+    // Finally invoke the docker buildx bake command
+    let mut child = Command::new("docker")
+        .arg("buildx")
+        .arg("bake")
+        .arg_if(args.load, "--load")
+        .arg("--file")
+        .arg("-")
+        .stdin(Stdio::piped())
+        .spawn()
+        .context(SpawnChildProcessSnafu)?;
+
+    // Acquire stdin handle to pipe the bakefile as JSON to it
+    let stdin_handle = child.stdin.take().with_context(|| {
+        child
+            .kill()
+            .expect("killing the child process must succeed");
+        AcquireStdinHandleSnafu
+    })?;
+
+    serde_json::to_writer(stdin_handle, &bakefile).with_context(|_| {
+        child
+            .kill()
+            .expect("killing the child process must succeed");
+        SerializeBakefileSnafu
+    })?;
+
+    // Wait for successful completion of the child process
+    let status = child.wait().context(RunChildProcessSnafu)?;
+
+    // TODO (@Techassi): Return an error if the status was not a success
+    if status.success() {
+        println!(
+            "Successfully built {count} image{plural}:\n{images}",
+            plural = if count > 1 { "s" } else { "" },
+            images = image_manifest_uris.join("\n")
+        );
+    }
+
+    Ok(())
+}
diff --git a/rust/boil/src/build/platform.rs b/rust/boil/src/build/platform.rs
new file mode 100644
index 000000000..857e4b532
--- /dev/null
+++ b/rust/boil/src/build/platform.rs
@@ -0,0 +1,67 @@
+use std::{fmt::Display, str::FromStr};
+
+use serde::Serialize;
+use snafu::{OptionExt as _, ResultExt, Snafu};
+
+#[derive(Debug, Snafu)]
+pub enum ParseArchitecturePairError {
+    #[snafu(display("encountered invalid format, expected platform/architecture"))]
+    InvalidFormat,
+
+    #[snafu(display("failed to parse architecture"))]
+    ParseArchitecture { source: strum::ParseError },
+
+    #[snafu(display("unsupported, target platform"))]
+    UnsupportedPlatform,
+}
+
+#[derive(Clone, Debug)]
+pub enum TargetPlatform {
+    Linux(Architecture),
+}
+
+impl Serialize for TargetPlatform {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+impl FromStr for TargetPlatform {
+    type Err = ParseArchitecturePairError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let (platform, architecture) = s.split_once('/').context(InvalidFormatSnafu)?;
+        let architecture = Architecture::from_str(architecture).context(ParseArchitectureSnafu)?;
+
+        match platform {
+            "linux" => Ok(Self::Linux(architecture)),
+            _ => UnsupportedPlatformSnafu.fail(),
+        }
+    }
+}
+
+impl Display for TargetPlatform {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match &self {
+            TargetPlatform::Linux(architecture) => write!(f, "linux/{architecture}"),
+        }
+    }
+}
+
+impl TargetPlatform {
+    pub fn architecture(&self) -> &Architecture {
+        match self {
+            TargetPlatform::Linux(architecture) => architecture,
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug, strum::Display, strum::EnumString, strum::AsRefStr)]
+#[strum(serialize_all = "lowercase")]
+pub enum Architecture {
+    Amd64,
+    Arm64,
+}
diff --git a/rust/boil/src/cli.rs b/rust/boil/src/cli.rs
new file mode 100644
index 000000000..85323f289
--- /dev/null
+++ b/rust/boil/src/cli.rs
@@ -0,0 +1,37 @@
+use std::path::PathBuf;
+
+use clap::{Parser, Subcommand};
+
+use crate::{build::cli::BuildArguments, completions::CompletionsArguments, show::ShowArguments};
+
+#[derive(Debug, Parser)]
+#[command(author, version, about)]
+pub struct Cli {
+    /// Path to the configuration file.
+    #[arg(short, long = "configuration", global = true, default_value_os_t = Self::default_config_path())]
+    pub config_path: PathBuf,
+
+    #[command(subcommand)]
+    pub command: Command,
+}
+
+impl Cli {
+    fn default_config_path() -> PathBuf {
+        PathBuf::from("./boil.toml")
+    }
+}
+
+#[derive(Debug, Subcommand)]
+pub enum Command {
+    /// Build one or more images.
+    ///
+    /// Requires docker with the buildx extension.
+    #[command(alias = "some-chicken")]
+    Build(BuildArguments),
+
+    /// Display various structured outputs in JSON format.
+    Show(ShowArguments),
+
+    /// Generate shell completions.
+    Completions(CompletionsArguments),
+}
diff --git a/rust/boil/src/completions/mod.rs b/rust/boil/src/completions/mod.rs
new file mode 100644
index 000000000..2c70386df
--- /dev/null
+++ b/rust/boil/src/completions/mod.rs
@@ -0,0 +1,18 @@
+use clap::{Args, CommandFactory};
+use clap_complete::Shell;
+
+use crate::cli::Cli;
+
+#[derive(Debug, Args)]
+pub struct CompletionsArguments {
+    /// Shell to generate completions for.
+    pub shell: Shell,
+}
+
+/// This is the `boil completions` command handler function.
+pub fn run_command(arguments: CompletionsArguments) {
+    let mut cli = Cli::command();
+    let bin_name = cli.get_bin_name().unwrap_or("boil").to_owned();
+
+    clap_complete::generate(arguments.shell, &mut cli, bin_name, &mut std::io::stdout());
+}
diff --git a/rust/boil/src/config.rs b/rust/boil/src/config.rs
new file mode 100644
index 000000000..19d4ff3c0
--- /dev/null
+++ b/rust/boil/src/config.rs
@@ -0,0 +1,39 @@
+use std::path::Path;
+
+use serde::Deserialize;
+use snafu::{ResultExt, Snafu};
+use url::Url;
+
+use crate::build::docker::BuildArguments;
+
+#[derive(Debug, Snafu)]
+pub enum ConfigError {
+    ReadFile { source: std::io::Error },
+
+    Deserialize { source: toml::de::Error },
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Config {
+    pub build_arguments: BuildArguments,
+    pub metadata: Metadata,
+}
+
+impl Config {
+    pub fn from_file(path: impl AsRef<Path>) -> Result<Self, ConfigError> {
+        let contents = std::fs::read_to_string(path).context(ReadFileSnafu)?;
+        toml::from_str(&contents).context(DeserializeSnafu)
+    }
+}
+
+// NOTE (@Techassi): Think about if these metadata fields should be required or optional. If they
+// are optional, the appropriate annotations are only emitted if set.
+#[derive(Debug, Deserialize)]
+pub struct Metadata {
+    pub documentation: Url,
+    pub licenses: String,
+    pub authors: String,
+    pub vendor: String,
+    pub source: Url,
+}
diff --git a/rust/boil/src/main.rs b/rust/boil/src/main.rs
new file mode 100644
index 000000000..189616ac7
--- /dev/null
+++ b/rust/boil/src/main.rs
@@ -0,0 +1,112 @@
+use clap::Parser;
+use semver::Version;
+use snafu::{ResultExt, Snafu};
+
+use crate::{
+    cli::{Cli, Command},
+    config::Config,
+    show::ShowCommand,
+};
+
+// Common modules
+mod cli;
+mod config;
+mod utils;
+
+// Command modules
+mod build;
+mod completions;
+mod show;
+
+/// This trait extends functionailty provided by [`snafu`].
+///
+/// [`snafu`] already provides various ways to extend [`Result`]s with additional context-sensitive
+/// information. This trait allows calling `if_context` on any type, which runs a predicate to
+/// determine if an error with the provided context should be returned.
+///
+/// This trait can be thought of as a combination of [`snafu::ensure!`] and returning [`Ok`]
+/// afterwards.
+pub trait IfContext: Sized {
+    /// Runs `predicate` and returns [`Ok`] if `true` or [`Err`] (with data from `context`) otherwise.
+    fn if_context<P, C, E>(self, predicate: P, context: C) -> Result<Self, E>
+    where
+        P: Fn(&Self) -> bool,
+        C: snafu::IntoError<E, Source = snafu::NoneError>,
+        E: std::error::Error + snafu::ErrorCompat;
+}
+
+impl<T> IfContext for T {
+    fn if_context<P, C, E>(self, predicate: P, context: C) -> Result<Self, E>
+    where
+        P: Fn(&Self) -> bool,
+        C: snafu::IntoError<E, Source = snafu::NoneError>,
+        E: std::error::Error + snafu::ErrorCompat,
+    {
+        match predicate(&self) {
+            true => Ok(self),
+            false => Err(context.into_error(snafu::NoneError)),
+        }
+    }
+}
+
+pub trait VersionExt {
+    /// Returns the base of a [`Version`] as a string, eg. `1.2.3`.
+    fn base(&self) -> String;
+
+    /// Returns the base and prerelease of a [`Version`] as a string, eg. `1.2.3-rc.1`.
+    fn base_prerelease(&self) -> String;
+}
+
+impl VersionExt for Version {
+    fn base(&self) -> String {
+        let Self {
+            major,
+            minor,
+            patch,
+            ..
+        } = self;
+
+        format!("{major}.{minor}.{patch}")
+    }
+
+    fn base_prerelease(&self) -> String {
+        let mut base = self.base();
+        base.push('-');
+        base.push_str(&self.pre);
+        base
+    }
+}
+
+#[derive(Debug, Snafu)]
+enum Error {
+    #[snafu(display("failed to run build command"))]
+    Build { source: build::Error },
+
+    #[snafu(display("failed to run show command"))]
+    Show { source: show::images::Error },
+
+    #[snafu(display("failed to read config"))]
+    ReadConfig { source: config::ConfigError },
+}
+
+#[tokio::main(flavor = "current_thread")]
+#[snafu::report]
+async fn main() -> Result<(), Error> {
+    let cli = Cli::parse();
+
+    match cli.command {
+        Command::Build(arguments) => {
+            let config = Config::from_file(&cli.config_path).context(ReadConfigSnafu)?;
+            build::run_command(arguments, config).context(BuildSnafu)
+        }
+        Command::Show(arguments) => match arguments.commands {
+            ShowCommand::Images(arguments) => {
+                show::images::run_command(arguments).context(ShowSnafu)
+            }
+        },
+        Command::Completions(arguments) => {
+            completions::run_command(arguments);
+            Ok(())
+        }
+    }
+}
diff --git a/rust/boil/src/show/images/cli.rs b/rust/boil/src/show/images/cli.rs
new file mode 100644
index 000000000..0c3469ef5
--- /dev/null
+++ b/rust/boil/src/show/images/cli.rs
@@ -0,0 +1,22 @@
+use clap::{Args, ValueEnum};
+
+use crate::build::image::Image;
+
+#[derive(Debug, Args)]
+pub struct ShowImagesArguments {
+    /// Optionally specify one or more images to display.
+    pub image: Vec<Image>,
+
+    /// Pretty print the structured output.
+    #[arg(long, value_enum, default_value_t = Pretty::default())]
+    pub pretty: Pretty,
+}
+
+// #[derive(Clone, Debug, Default, strum::Display, strum::EnumString)]
+#[derive(Clone, Debug, Default, ValueEnum)]
+pub enum Pretty {
+    #[default]
+    Auto,
+    Always,
+    Never,
+}
diff --git a/rust/boil/src/show/images/mod.rs b/rust/boil/src/show/images/mod.rs
new file mode 100644
index 000000000..f977fd02e
--- /dev/null
+++ b/rust/boil/src/show/images/mod.rs
@@ -0,0 +1,54 @@
+use std::{collections::BTreeMap, io::IsTerminal};
+
+use snafu::{ResultExt, Snafu};
+
+use crate::{
+    build::bakefile::{Targets, TargetsError, TargetsOptions},
+    show::images::cli::{Pretty, ShowImagesArguments},
+};
+
+pub mod cli;
+
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("failed to serialize list as JSON"))]
+    SerializeList { source: serde_json::Error },
+
+    #[snafu(display("failed to build list of targets"))]
+    BuildTargets { source: TargetsError },
+}
+
+/// This is the `boil show images` command handler function.
+pub fn run_command(arguments: ShowImagesArguments) -> Result<(), Error> {
+    let list: BTreeMap<_, _> = if arguments.image.is_empty() {
+        Targets::all(TargetsOptions { only_entry: true })
+            .context(BuildTargetsSnafu)?
+            .into_iter()
+    } else {
+        Targets::set(&arguments.image, TargetsOptions { only_entry: true })
+            .context(BuildTargetsSnafu)?
+            .into_iter()
+    }
+    .map(|(image_name, image_versions)| {
+        let versions: Vec<_> = image_versions
+            .into_iter()
+            .map(|(image_version, (_, _))| image_version)
+            .collect();
+        (image_name, versions)
+    })
+    .collect();
+
+    print_to_stdout(list, arguments.pretty)
+}
+
+fn print_to_stdout(list: BTreeMap<String, Vec<String>>, pretty: Pretty) -> Result<(), Error> {
+    let stdout = std::io::stdout();
+
+    match pretty {
+        Pretty::Always | Pretty::Auto if stdout.is_terminal() => {
+            serde_json::to_writer_pretty(stdout, &list)
+        }
+        _ => serde_json::to_writer(stdout, &list),
+    }
+    .context(SerializeListSnafu)
+}
diff --git a/rust/boil/src/show/mod.rs b/rust/boil/src/show/mod.rs
new file mode 100644
index 000000000..a6ad01b43
--- /dev/null
+++ b/rust/boil/src/show/mod.rs
@@ -0,0 +1,16 @@
+use clap::{Args, Subcommand};
+
+use crate::show::images::cli::ShowImagesArguments;
+
+pub mod images;
+
+#[derive(Debug, Args)]
+pub struct ShowArguments {
+    #[command(subcommand)]
+    pub commands: ShowCommand,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum ShowCommand {
+    Images(ShowImagesArguments),
+}
diff --git a/rust/boil/src/utils.rs b/rust/boil/src/utils.rs
new file mode 100644
index 000000000..f3b4e4ea7
--- /dev/null
+++ b/rust/boil/src/utils.rs
@@ -0,0 +1,48 @@
+use std::process::Command;
+
+use semver::Version;
+use url::Host;
+
+use crate::build::platform::Architecture;
+
+/// Formats and returns the image repository URI, eg. `oci.stackable.tech/sdp/opa`.
+pub fn format_image_repository_uri(
+    image_registry: &Host,
+    registry_namespace: &str,
+    image_name: &str,
+) -> String {
+    format!("{image_registry}/{registry_namespace}/{image_name}")
+}
+
+/// Formats and returns the image manifest URI, eg. `oci.stackable.tech/sdp/opa:1.4.2-stackable25.7.0-amd64`.
+pub fn format_image_manifest_uri(
+    image_repository_uri: &str,
+    image_version: &str,
+    sdp_image_version: &Version,
+    architecture: &Architecture,
+    strip_architecture: bool,
+) -> String {
+    if strip_architecture {
+        format!("{image_repository_uri}:{image_version}-stackable{sdp_image_version}")
+    } else {
+        format!(
+            "{image_repository_uri}:{image_version}-stackable{sdp_image_version}-{architecture}"
+        )
+    }
+}
+
+pub trait CommandExt {
+    /// Adds an argument to the command if the `predicate` is `true`.
+    fn arg_if<S>(&mut self, predicate: bool, arg: S) -> &mut Self
+    where
+        S: AsRef<std::ffi::OsStr>;
+}
+
+impl CommandExt for Command {
+    fn arg_if<S>(&mut self, predicate: bool, arg: S) -> &mut Self
+    where
+        S: AsRef<std::ffi::OsStr>,
+    {
+        if predicate { self.arg(arg) } else { self }
+    }
+}
diff --git a/rust/patchable/Cargo.toml b/rust/patchable/Cargo.toml
index cb72ed092..9b8653ee6 100644
--- a/rust/patchable/Cargo.toml
+++ b/rust/patchable/Cargo.toml
@@ -2,6 +2,10 @@
 name = "patchable"
 version = "0.1.0"
 edition = "2021"
+authors.workspace = true
+license.workspace = true
+repository.workspace = true
+publish = false
 
 [dependencies]
 clap.workspace = true
diff --git a/rust/patchable/src/patch.rs b/rust/patchable/src/patch.rs
index 00cbd1ae9..5f590dc6e 100644
--- a/rust/patchable/src/patch.rs
+++ b/rust/patchable/src/patch.rs
@@ -7,15 +7,14 @@ use git2::{Oid, Repository};
 use snafu::{OptionExt, ResultExt as _, Snafu};
 use tracing_indicatif::suspend_tracing_indicatif;
 
+#[cfg(doc)]
+use crate::repo::ensure_worktree_is_at;
 use crate::{
     error::{self, CommitId},
     patch_mail::{self, mailinfo, mailsplit},
     utils::raw_git_cmd,
 };
 
-#[cfg(doc)]
-use crate::repo::ensure_worktree_is_at;
-
 #[derive(Debug, Snafu)]
 pub enum Error {
     #[snafu(display("failed to open stgit series file {path:?}"))]
@@ -61,14 +60,18 @@ pub enum Error {
         source: git2::Error,
         parent_commit: error::CommitId,
     },
-    #[snafu(display("failed to apply patch {patch_email_file:?} (from {patch_file:?}) to parent commit {parent_commit}"))]
+    #[snafu(display(
+        "failed to apply patch {patch_email_file:?} (from {patch_file:?}) to parent commit {parent_commit}"
+    ))]
     ApplyPatch {
         source: git2::Error,
         parent_commit: error::CommitId,
         patch_email_file: PathBuf,
         patch_file: PathBuf,
     },
-    #[snafu(display("failed to write tree for patch {patch_email_file:?} (from {patch_file:?}) applied to parent commit {parent_commit}"))]
+    #[snafu(display(
+        "failed to write tree for patch {patch_email_file:?} (from {patch_file:?}) applied to parent commit {parent_commit}"
+    ))]
     WritePatchedTree {
         source: git2::Error,
         parent_commit: error::CommitId,
@@ -77,7 +80,9 @@ pub enum Error {
     },
     #[snafu(display("failed to read patched tree {tree}"))]
     ReadPatchedTree { source: git2::Error, tree: Oid },
-    #[snafu(display("failed to write commit for patch {patch_email_file:?} (from {patch_file:?}) applied to parent commit {parent_commit}"))]
+    #[snafu(display(
+        "failed to write commit for patch {patch_email_file:?} (from {patch_file:?}) applied to parent commit {parent_commit}"
+    ))]
     WriteCommit {
         source: git2::Error,
         parent_commit: error::CommitId,
diff --git a/rust/patchable/src/patch_mail.rs b/rust/patchable/src/patch_mail.rs
index 680c32c2b..3a4fa330f 100644
--- a/rust/patchable/src/patch_mail.rs
+++ b/rust/patchable/src/patch_mail.rs
@@ -9,8 +9,8 @@ use std::{
 
 use git2::{Diff, Repository, Signature};
 use snafu::{OptionExt as _, ResultExt, Snafu};
-use tempfile::{tempdir, NamedTempFile};
-use time::{format_description::well_known::Rfc2822, OffsetDateTime};
+use tempfile::{NamedTempFile, tempdir};
+use time::{OffsetDateTime, format_description::well_known::Rfc2822};
 use tracing_indicatif::suspend_tracing_indicatif;
 
 use crate::utils::raw_git_cmd;
diff --git a/rust/patchable/src/repo.rs b/rust/patchable/src/repo.rs
index 26e31cdac..0b0335b6a 100644
--- a/rust/patchable/src/repo.rs
+++ b/rust/patchable/src/repo.rs
@@ -28,9 +28,7 @@ pub enum Error {
         path: PathBuf,
     },
 
-    #[snafu(display(
-        "failed to create worktree branch {branch:?} pointing at {commit} in {repo}"
-    ))]
+    #[snafu(display("failed to create worktree branch {branch:?} pointing at {commit} in {repo}"))]
     CreateWorktreeBranch {
         source: git2::Error,
         repo: error::RepoPath,
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 000000000..07217b21f
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,9 @@
+# This file includes unstable features, so you need to run "cargo +nightly fmt" to format your code.
+# It's also ok to use the stable toolchain by simple running "cargo fmt", but using the nigthly formatter is prefered.
+
+# https://doc.rust-lang.org/nightly/edition-guide/rust-2024/rustfmt-style-edition.html
+style_edition = "2024"
+imports_granularity = "Crate"
+group_imports = "StdExternalCrate"
+reorder_impl_items = true
+use_field_init_shorthand = true
diff --git a/shared/statsd-exporter/Dockerfile b/shared/statsd-exporter/Dockerfile
index d5b2b4cac..3840fc0f9 100644
--- a/shared/statsd-exporter/Dockerfile
+++ b/shared/statsd-exporter/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/stackable-base
-ARG PRODUCT
+FROM local-image/stackable-base
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /statsd_exporter
@@ -26,18 +26,18 @@ export GOPATH=/go_cache
 # We use version 1.7.0, since a newer version of cyclonedx-gomod is not compatible with the version of Golang (>= 1.23.1)
 go install github.com/CycloneDX/cyclonedx-gomod/cmd/cyclonedx-gomod@v1.7.0
 
-curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exporter-${PRODUCT}.src.tar.gz" | tar -xzC .
+curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exporter-${PRODUCT_VERSION}.src.tar.gz" | tar -xzC .
 (
-  cd "statsd_exporter-${PRODUCT}" || exit
+  cd "statsd_exporter-${PRODUCT_VERSION}" || exit
 
   # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of statsd_exporter
   git init
   git config user.email "fake.commiter@stackable.tech"
   git config user.name "Fake commiter"
   git commit --allow-empty --message "Fake commit, so that we can create a tag"
-  git tag "v${PRODUCT}"
+  git tag "v${PRODUCT_VERSION}"
   go build -o ../statsd_exporter
-  $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT}.cdx.json -packages -files
+  $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT_VERSION}.cdx.json -packages -files
 )
-rm -rf "statsd_exporter-${PRODUCT}"
+rm -rf "statsd_exporter-${PRODUCT_VERSION}"
 EOF
diff --git a/shared/statsd-exporter/boil-config.toml b/shared/statsd-exporter/boil-config.toml
new file mode 100644
index 000000000..c2f9afcb2
--- /dev/null
+++ b/shared/statsd-exporter/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."0.28.0".local-images]
+stackable-base = "1.0.0"
diff --git a/shared/statsd-exporter/versions.py b/shared/statsd-exporter/versions.py
deleted file mode 100644
index adb26f18a..000000000
--- a/shared/statsd-exporter/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "0.28.0",
-        "stackable-base": "1.0.0",
-    }
-]
diff --git a/spark-connect-client/Dockerfile b/spark-connect-client/Dockerfile
index 4750a071e..fd2c9e950 100644
--- a/spark-connect-client/Dockerfile
+++ b/spark-connect-client/Dockerfile
@@ -1,18 +1,18 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 
 # spark-builder: provides client libs for spark-connect
-FROM stackable/image/spark-k8s AS spark-builder
+FROM local-image/spark-k8s AS spark-builder
 
-ARG PRODUCT
-ARG PYTHON
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG PYTHON_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Stackable Spark Connect Examples" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="Spark Connect Examples" \
     description="Spark Connect client libraries for Python and the JVM, including some examples."
 
@@ -26,7 +26,7 @@ RUN <<EOF
 microdnf update
 # python{version}-setuptools: needed to build the pyspark[connect] package
 microdnf install --nodocs \
-  "python${PYTHON}-setuptools"
+  "python${PYTHON_VERSION}-setuptools"
 microdnf clean all
 rm -rf /var/cache/yum
 
@@ -43,7 +43,7 @@ USER ${STACKABLE_USER_UID}
 # - pyspark[connect] = spark connect client libs
 # - jupyterlab = notebook client used in demos
 RUN pip install --no-cache-dir --user \
-  "pyspark[connect]==${PRODUCT}" \
+  "pyspark[connect]==${PRODUCT_VERSION}" \
   "jupyterlab==4.4.1" \
   "scikit-learn==1.3.1" \
   "matplotlib==3.10.1"
diff --git a/spark-connect-client/boil-config.toml b/spark-connect-client/boil-config.toml
new file mode 100644
index 000000000..f6a8150db
--- /dev/null
+++ b/spark-connect-client/boil-config.toml
@@ -0,0 +1,13 @@
+[versions."3.5.6".local-images]
+spark-k8s = "3.5.6"
+java-base = "17"
+
+[versions."3.5.6".build-arguments]
+python-version = "3.11"
+
+[versions."4.0.0".local-images]
+spark-k8s = "4.0.0"
+java-base = "17"
+
+[versions."4.0.0".build-arguments]
+python-version = "3.11"
diff --git a/spark-connect-client/versions.py b/spark-connect-client/versions.py
deleted file mode 100644
index 98188f344..000000000
--- a/spark-connect-client/versions.py
+++ /dev/null
@@ -1,14 +0,0 @@
-versions = [
-    {
-        "product": "3.5.6",
-        "spark-k8s": "3.5.6",
-        "java-base": "17",
-        "python": "3.11",
-    },
-    {
-        "product": "4.0.0",
-        "spark-k8s": "4.0.0",
-        "java-base": "17",
-        "python": "3.11",
-    },
-]
diff --git a/spark-k8s/Dockerfile b/spark-k8s/Dockerfile
index f28a04579..21208b2a9 100644
--- a/spark-k8s/Dockerfile
+++ b/spark-k8s/Dockerfile
@@ -2,46 +2,46 @@
 # check=error=true
 
 # hadoop-builder: Provides Hadoop libraries
-FROM stackable/image/hadoop/hadoop AS hadoop-builder
+FROM local-image/hadoop/hadoop AS hadoop-builder
 
 # hbase-builder: Provides HBase libraries
-FROM stackable/image/hbase AS hbase-builder
+FROM local-image/hbase AS hbase-builder
 
 # spark-source-builder: Clone the Spark source code and apply patches
-FROM stackable/image/java-devel AS spark-source-builder
+FROM local-image/java-devel AS spark-source-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/stackable/patches/patchable.toml /stackable/src/spark-k8s/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/stackable/patches/${PRODUCT} /stackable/src/spark-k8s/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/stackable/patches/${PRODUCT_VERSION} /stackable/src/spark-k8s/stackable/patches/${PRODUCT_VERSION}
 
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout spark-k8s ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout spark-k8s ${PRODUCT_VERSION})"
 
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/spark-${PRODUCT}-stackable${RELEASE}-src.tar.gz .
-chmod g=u /stackable/spark-${PRODUCT}-stackable${RELEASE}-src.tar.gz
+tar -czf /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
+chmod g=u /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz
 EOF
 
 # hbase-connectors-builder: Build the Spark HBase connector and copy
 # required JARs into /stackable/spark/jars
-FROM stackable/image/java-devel AS hbase-connectors-builder
+FROM local-image/java-devel AS hbase-connectors-builder
 
-ARG PRODUCT
-ARG RELEASE
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG HBASE
-ARG HBASE_CONNECTOR
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG HBASE_VERSION
+ARG HBASE_CONNECTOR_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
@@ -51,20 +51,20 @@ WORKDIR /stackable
 # not required and not copied, therefore mvn must be called with the
 # parameter --non-recursive.
 COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder \
-    /stackable/src/spark-k8s/patchable-work/worktree/${PRODUCT}/pom.xml \
+    /stackable/src/spark-k8s/patchable-work/worktree/${PRODUCT_VERSION}/pom.xml \
     spark/
 
 # Patch the hbase-connectors source code
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/hbase-connectors/stackable/patches/patchable.toml /stackable/src/spark-k8s/hbase-connectors/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/hbase-connectors/stackable/patches/${HBASE_CONNECTOR} /stackable/src/spark-k8s/hbase-connectors/stackable/patches/${HBASE_CONNECTOR}
+COPY --chown=${STACKABLE_USER_UID}:0 spark-k8s/hbase-connectors/stackable/patches/${HBASE_CONNECTOR_VERSION} /stackable/src/spark-k8s/hbase-connectors/stackable/patches/${HBASE_CONNECTOR_VERSION}
 
 RUN <<EOF
 
 # IMPORTANT: HBase connectors don't support Spark 4 yet, so we skip the build.
 # Watch this PR for updates: https://github.com/apache/hbase-connectors/pull/130
-if [[ "${PRODUCT}" == 4* ]]; then
+if [[ "${PRODUCT_VERSION}" == 4* ]]; then
     # Create this empty directory so that following COPY layers succeed.
     mkdir -p /stackable/spark/jars
     # Create a dummy tarball to satisfy the build process for Spark 3.
@@ -74,12 +74,12 @@ fi
 
 cd "$(/stackable/patchable --images-repo-root=src checkout spark-k8s/hbase-connectors ${HBASE_CONNECTOR})/spark"
 
-NEW_VERSION="${HBASE_CONNECTOR}-stackable${RELEASE}"
+NEW_VERSION="${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
 # Create snapshot of the source code including custom patches
-tar -czf /stackable/hbase-connector-${HBASE_CONNECTOR}-stackable${RELEASE}-src.tar.gz .
+tar -czf /stackable/hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
 
 # Building the hbase-connectors with JDK 17 is not yet supported, see
 # https://github.com/apache/hbase-connectors/pull/132.
@@ -105,17 +105,19 @@ SCALA_BINARY_VERSION=$(grep "scala.binary.version" /stackable/spark/pom.xml | he
 #     at org.apache.hadoop.hbase.LocalHBaseCluster.startup(LocalHBaseCluster.java:407)
 #     at org.apache.hadoop.hbase.MiniHBaseCluster.init(MiniHBaseCluster.java:250)
 mvn \
-    --define spark.version="${PRODUCT}" \
+    --batch-mode \
+    --no-transfer-progress \
+    --define spark.version="${PRODUCT_VERSION}" \
     --define scala.version="${SCALA_VERSION}" \
     --define scala.binary.version="${SCALA_BINARY_VERSION}" \
     --define hadoop-three.version="${HADOOP_VERSION}" \
-    --define hbase.version="${HBASE}" \
+    --define hbase.version="${HBASE_VERSION}" \
     --define skipTests \
     --define maven.test.skip=true \
     clean package
 
 mkdir -p /stackable/spark/jars
-ln -s "$(pwd)/hbase-spark/target/hbase-spark-${HBASE_CONNECTOR}-stackable${RELEASE}.jar" /stackable/spark/jars/hbase-spark-${HBASE_CONNECTOR}-stackable${RELEASE}.jar
+ln -s "$(pwd)/hbase-spark/target/hbase-spark-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}.jar" /stackable/spark/jars/hbase-spark-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}.jar
 
 cd /stackable/spark/jars
 
@@ -128,35 +130,35 @@ mvn --non-recursive --file /stackable/spark/pom.xml \
     dependency:copy \
     -Dartifact=org.apache.logging.log4j:log4j-slf4j-impl:'${log4j.version}' \
     -DoutputDirectory=./jars
-chmod g=u /stackable/hbase-connector-${HBASE_CONNECTOR}-stackable${RELEASE}-src.tar.gz .
+chmod g=u /stackable/hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz .
 EOF
 
 
-# spark-builder: Build Spark into /stackable/spark-${PRODUCT}/dist,
+# spark-builder: Build Spark into /stackable/spark-${PRODUCT_VERSION}/dist,
 # download additional JARs and perform checks
-FROM stackable/image/java-devel AS spark-builder
+FROM local-image/java-devel AS spark-builder
 
-ARG PRODUCT
-ARG HADOOP_HADOOP
+ARG PRODUCT_VERSION
+ARG HADOOP_HADOOP_VERSION
 # Reassign the arg to `HADOOP_VERSION` for better readability.
-ENV HADOOP_VERSION=${HADOOP_HADOOP}
-ARG HBASE
-ARG AWS_JAVA_SDK_BUNDLE
-ARG AZURE_STORAGE
-ARG AZURE_KEYVAULT_CORE
-ARG JACKSON_DATAFORMAT_XML
-ARG STAX2_API
-ARG WOODSTOX_CORE
-ARG JMX_EXPORTER
+ENV HADOOP_VERSION=${HADOOP_HADOOP_VERSION}
+ARG HBASE_VERSION
+ARG AWS_JAVA_SDK_BUNDLE_VERSION
+ARG AZURE_STORAGE_VERSION
+ARG AZURE_KEYVAULT_CORE_VERSION
+ARG JACKSON_DATAFORMAT_XML_VERSION
+ARG STAX2_API_VERSION
+ARG WOODSTOX_CORE_VERSION
+ARG JMX_EXPORTER_VERSION
 ARG TARGETARCH
-ARG TINI
-ARG RELEASE
+ARG TINI_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
-WORKDIR /stackable/spark-${PRODUCT}-stackable${RELEASE}
+WORKDIR /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 
 COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder \
-    /stackable/src/spark-k8s/patchable-work/worktree/${PRODUCT} \
+    /stackable/src/spark-k8s/patchable-work/worktree/${PRODUCT_VERSION} \
     ./
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs /stackable/patched-libs
 
@@ -165,13 +167,13 @@ RUN <<EOF
     # Make Maven aware of custom Stackable libraries
     mv /stackable/patched-libs/maven /root/.m2/repository
 
-    ORIGINAL_VERSION="${PRODUCT}"
-    NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+    ORIGINAL_VERSION="${PRODUCT_VERSION}"
+    NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
     MAVEN_BIN="/usr/bin/mvn"
     export MAVEN_OPTS="-Xss64m -Xmx2g -XX:ReservedCodeCacheSize=1g"
 
-    case "${PRODUCT}" in
+    case "${PRODUCT_VERSION}" in
         4*)
             # The Spark 4 script has a --connect option which is not available in Spark 3.
             # This option is required to build Spark Connect.
@@ -179,14 +181,14 @@ RUN <<EOF
             ./dev/make-distribution.sh \
             --mvn "${MAVEN_BIN}" \
             --connect \
-            -Dhadoop.version="${HADOOP_VERSION}-stackable${RELEASE}" \
+            -Dhadoop.version="${HADOOP_VERSION}-stackable${RELEASE_VERSION}" \
             -DskipTests \
             -P'hadoop-3' -Pkubernetes -Phive -Phive-thriftserver
             ;;
         *)
             ./dev/make-distribution.sh \
             --mvn "${MAVEN_BIN}" \
-            -Dhadoop.version="${HADOOP_VERSION}-stackable${RELEASE}" \
+            -Dhadoop.version="${HADOOP_VERSION}-stackable${RELEASE_VERSION}" \
             -DskipTests \
             -P'hadoop-3' -Pkubernetes -Phive -Phive-thriftserver
             ;;
@@ -206,42 +208,42 @@ RUN <<EOF
     mkdir -p dist/connect
     cd dist/connect
 
-    case "${PRODUCT}" in
+    case "${PRODUCT_VERSION}" in
         4*)
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/sql/connect/server/target/spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/sql/connect/common/target/spark-connect-common_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/sql/connect/client/jvm/target/spark-connect-client-jvm_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/sql/connect/server/target/spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/sql/connect/common/target/spark-connect-common_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/sql/connect/client/jvm/target/spark-connect-client-jvm_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
             ;;
         *)
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/connector/connect/server/target/spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/connector/connect/common/target/spark-connect-common_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
-            cp "/stackable/spark-${PRODUCT}-stackable${RELEASE}/connector/connect/client/jvm/target/spark-connect-client-jvm_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/connector/connect/server/target/spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/connector/connect/common/target/spark-connect-common_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
+            cp "/stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/connector/connect/client/jvm/target/spark-connect-client-jvm_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" .
             ;;
     esac
 
     # This link is needed by the operator and is kept for backwards compatibility.
     # TODO: remove it at some time in the future.
-    ln -s "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT}.jar"
+    ln -s "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}.jar"
     # Link to the spark-connect jar without the stackable suffix and scala version.
     # This link supersedes the previous link.
-    ln -s "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT}-stackable${RELEASE}.jar" "spark-connect-${PRODUCT}.jar"
+    ln -s "spark-connect_${SCALA_BINARY_VERSION}-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.jar" "spark-connect-${PRODUCT_VERSION}.jar"
 EOF
 
 # <<< Build spark
 
-WORKDIR /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist/jars
+WORKDIR /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/jars
 
 # Copy modules required for s3a://
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 \
-    /stackable/hadoop/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE}.jar \
-    /stackable/hadoop/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE}.jar \
+    /stackable/hadoop/share/hadoop/tools/lib/hadoop-aws-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar \
+    /stackable/hadoop/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar \
     ./
 
 # Copy modules required for abfs://
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 \
-    /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE}.jar \
-    /stackable/hadoop/share/hadoop/tools/lib/azure-storage-${AZURE_STORAGE}.jar \
-    /stackable/hadoop/share/hadoop/tools/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE}.jar \
+    /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP_VERSION}-stackable${RELEASE_VERSION}.jar \
+    /stackable/hadoop/share/hadoop/tools/lib/azure-storage-${AZURE_STORAGE_VERSION}.jar \
+    /stackable/hadoop/share/hadoop/tools/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE_VERSION}.jar \
     ./
 
 # Copy the HBase connector including required modules
@@ -251,15 +253,15 @@ COPY --from=hbase-connectors-builder --chown=${STACKABLE_USER_UID}:0 \
 
 # Copy modules required to access HBase
 COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 \
-    /stackable/hbase/lib/shaded-clients/hbase-shaded-client-byo-hadoop-${HBASE}-stackable${RELEASE}.jar \
-    /stackable/hbase/lib/shaded-clients/hbase-shaded-mapreduce-${HBASE}-stackable${RELEASE}.jar \
+    /stackable/hbase/lib/shaded-clients/hbase-shaded-client-byo-hadoop-${HBASE_VERSION}-stackable${RELEASE_VERSION}.jar \
+    /stackable/hbase/lib/shaded-clients/hbase-shaded-mapreduce-${HBASE_VERSION}-stackable${RELEASE_VERSION}.jar \
     ./
-# Copy modules required to access HBase if $HBASE == 2.4.x
+# Copy modules required to access HBase if $HBASE_VERSION == 2.4.x
 COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 \
     /stackable/hbase/lib/client-facing-thirdparty/htrace-core4-*-incubating.jar \
     /stackable/hbase/lib/client-facing-thirdparty/slf4j-reload4j-*.jar \
     ./
-# Copy modules required to access HBase if $HBASE == 2.6.x
+# Copy modules required to access HBase if $HBASE_VERSION == 2.6.x
 COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 \
     /stackable/hbase/lib/client-facing-thirdparty/opentelemetry-api-*.jar \
     /stackable/hbase/lib/client-facing-thirdparty/opentelemetry-context-*.jar \
@@ -268,48 +270,48 @@ COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 \
 
 COPY spark-k8s/stackable/jmx /stackable/jmx
 
-WORKDIR /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist/extra-jars
+WORKDIR /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/extra-jars
 
 RUN <<EOF
 # Download jackson-dataformat-xml, stax2-api, and woodstox-core which are required for logging.
-curl --fail https://repo.stackable.tech/repository/packages/jackson-dataformat-xml/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar \
-  -o /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist/extra-jars/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML}.jar
-curl --fail https://repo.stackable.tech/repository/packages/stax2-api/stax2-api-${STAX2_API}.jar \
-  -o /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist/extra-jars/stax2-api-${STAX2_API}.jar
-curl --fail https://repo.stackable.tech/repository/packages/woodstox-core/woodstox-core-${WOODSTOX_CORE}.jar \
-  -o /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist/extra-jars/woodstox-core-${WOODSTOX_CORE}.jar
+curl --fail https://repo.stackable.tech/repository/packages/jackson-dataformat-xml/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML_VERSION}.jar \
+  -o /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/extra-jars/jackson-dataformat-xml-${JACKSON_DATAFORMAT_XML_VERSION}.jar
+curl --fail https://repo.stackable.tech/repository/packages/stax2-api/stax2-api-${STAX2_API_VERSION}.jar \
+  -o /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/extra-jars/stax2-api-${STAX2_API_VERSION}.jar
+curl --fail https://repo.stackable.tech/repository/packages/woodstox-core/woodstox-core-${WOODSTOX_CORE_VERSION}.jar \
+  -o /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist/extra-jars/woodstox-core-${WOODSTOX_CORE_VERSION}.jar
 
 # Get the correct `tini` binary for our architecture.
-curl --fail "https://repo.stackable.tech/repository/packages/tini/tini-${TINI}-${TARGETARCH}" \
+curl --fail "https://repo.stackable.tech/repository/packages/tini/tini-${TINI_VERSION}-${TARGETARCH}" \
   -o /usr/bin/tini
 chmod +x /usr/bin/tini
 
 # JMX Exporter
-curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" \
-  -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
+curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" \
+  -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
 
-chmod -R g=u /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist
-chmod -R g=u /stackable/spark-${PRODUCT}-stackable${RELEASE}/assembly/target/bom.json
+chmod -R g=u /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist
+chmod -R g=u /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/assembly/target/bom.json
 chmod -R g=u /stackable/jmx
 EOF
 
 # TODO: java-base installs the Adoptium dnf repo and the Termurin jre which is not needed here.
 # To reduce the size of this image, the Adoptium repo could be moved to stackable-base instead.
-FROM stackable/image/java-base AS final
+FROM local-image/java-base AS final
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG PYTHON
-ARG RELEASE
-ARG JMX_EXPORTER
-ARG HBASE_CONNECTOR
+ARG RELEASE_VERSION
+ARG JMX_EXPORTER_VERSION
+ARG HBASE_CONNECTOR_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Apache Spark" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Apache Spark with PySpark support." \
     description="This image is deployed by the Stackable Operator for Apache Spark on Kubernetes."
 
@@ -323,10 +325,10 @@ ENV PYSPARK_PYTHON=/usr/bin/python
 ENV PYTHONPATH=$SPARK_HOME/python
 
 
-COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRODUCT}-stackable${RELEASE}/dist /stackable/spark
-COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder /stackable/spark-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
-COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-connectors-builder /stackable/hbase-connector-${HBASE_CONNECTOR}-stackable${RELEASE}-src.tar.gz /stackable
-COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRODUCT}-stackable${RELEASE}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT}-stackable${RELEASE}.cdx.json
+COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/dist /stackable/spark
+COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-source-builder /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=hbase-connectors-builder /stackable/hbase-connector-${HBASE_CONNECTOR_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/assembly/target/bom.json /stackable/spark/spark-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
 COPY --chown=${STACKABLE_USER_UID}:0 --from=spark-builder /stackable/jmx /stackable/jmx
 COPY --from=spark-builder /usr/bin/tini /usr/bin/tini
 
diff --git a/spark-k8s/boil-config.toml b/spark-k8s/boil-config.toml
new file mode 100644
index 000000000..1cd64b1be
--- /dev/null
+++ b/spark-k8s/boil-config.toml
@@ -0,0 +1,56 @@
+[versions."3.5.5".local-images]
+"hadoop/hadoop" = "3.4.1" # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
+java-base = "17"
+java-devel = "17"
+hbase = "2.6.2" # Current Stackable LTS version. Used to build the HBase connector.
+vector = "0.47.0"
+
+[versions."3.5.5".build-arguments]
+python-version = "3.11"
+aws-java-sdk-bundle-version = "2.24.6" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
+azure-storage-version = "7.0.1" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
+azure-keyvault-core-version = "1.0.0" # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
+jackson-dataformat-xml-version = "2.15.2" # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
+stax2-api-version = "4.2.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+woodstox-core-version = "6.5.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+jmx-exporter-version = "1.3.0"
+tini-version = "0.19.0"
+hbase-connector-version = "1.0.1"
+
+[versions."3.5.6".local-images]
+"hadoop/hadoop" = "3.4.1" # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
+java-base = "17"
+java-devel = "17"
+hbase = "2.6.2" # Current Stackable LTS version. Used to build the HBase connector.
+vector = "0.47.0"
+
+[versions."3.5.6".build-arguments]
+python-version = "3.11"
+aws-java-sdk-bundle-version = "2.24.6" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
+azure-storage-version = "7.0.1" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
+azure-keyvault-core-version = "1.0.0" # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
+jackson-dataformat-xml-version = "2.15.2" # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
+stax2-api-version = "4.2.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+woodstox-core-version = "6.5.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+jmx-exporter-version = "1.3.0"
+tini-version = "0.19.0"
+hbase-connector-version = "1.0.1"
+
+[versions."4.0.0".local-images]
+"hadoop/hadoop" = "3.4.1"
+java-base = "17"
+java-devel = "17"
+hbase = "2.6.2"
+vector = "0.47.0"
+
+[versions."4.0.0".build-arguments]
+python-version = "3.11"
+aws-java-sdk-bundle-version = "2.24.6"
+azure-storage-version = "7.0.1" # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.4
+azure-keyvault-core-version = "1.0.0" # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
+jackson-dataformat-xml-version = "2.15.2" # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1
+stax2-api-version = "4.2.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+woodstox-core-version = "6.5.1" # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
+jmx-exporter-version = "1.3.0"
+tini-version = "0.19.0"
+hbase-connector-version = "1.0.1" # This is not supported in Spark 4 yet.
diff --git a/spark-k8s/versions.py b/spark-k8s/versions.py
deleted file mode 100644
index f49471757..000000000
--- a/spark-k8s/versions.py
+++ /dev/null
@@ -1,56 +0,0 @@
-versions = [
-    {
-        "product": "3.5.5",
-        "java-base": "17",
-        "java-devel": "17",
-        "python": "3.11",
-        "hadoop/hadoop": "3.4.1",  # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
-        "hbase": "2.6.2",  # Current Stackable LTS version. Used to build the HBase connector.
-        "aws_java_sdk_bundle": "2.24.6",  # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
-        "azure_storage": "7.0.1",  # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
-        "azure_keyvault_core": "1.0.0",  # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
-        "jackson_dataformat_xml": "2.15.2",  # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
-        "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "vector": "0.47.0",
-        "jmx_exporter": "1.3.0",
-        "tini": "0.19.0",
-        "hbase_connector": "1.0.1",
-    },
-    {
-        "product": "3.5.6",
-        "java-base": "17",
-        "java-devel": "17",
-        "python": "3.11",
-        "hadoop/hadoop": "3.4.1",  # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
-        "hbase": "2.6.2",  # Current Stackable LTS version. Used to build the HBase connector.
-        "aws_java_sdk_bundle": "2.24.6",  # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
-        "azure_storage": "7.0.1",  # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
-        "azure_keyvault_core": "1.0.0",  # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
-        "jackson_dataformat_xml": "2.15.2",  # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
-        "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "vector": "0.47.0",
-        "jmx_exporter": "1.3.0",
-        "tini": "0.19.0",
-        "hbase_connector": "1.0.1",
-    },
-    {
-        "product": "4.0.0",
-        "java-base": "17",
-        "java-devel": "17",
-        "python": "3.11",
-        "hadoop/hadoop": "3.4.1",
-        "hbase": "2.6.2",
-        "aws_java_sdk_bundle": "2.24.6",
-        "azure_storage": "7.0.1",  # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.4
-        "azure_keyvault_core": "1.0.0",  # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
-        "jackson_dataformat_xml": "2.15.2",  # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1
-        "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
-        "vector": "0.47.0",
-        "jmx_exporter": "1.3.0",
-        "tini": "0.19.0",
-        "hbase_connector": "1.0.1",  # This is not supported in Spark 4 yet.
-    },
-]
diff --git a/stackable-base/Dockerfile b/stackable-base/Dockerfile
index 7ad3e5c65..2b3590191 100644
--- a/stackable-base/Dockerfile
+++ b/stackable-base/Dockerfile
@@ -7,7 +7,7 @@
 # Build time dependencies that are used in multiple images can be added to `stackable-devel` (or a derivative like `java-devel`) instead
 #
 
-FROM stackable/image/stackable-devel AS config-utils
+FROM local-image/stackable-devel AS config-utils
 
 # Find the latest version here: https://github.com/stackabletech/config-utils/tags
 # renovate: datasource=github-tags packageName=stackabletech/config-utils
@@ -20,7 +20,7 @@ cd ./config-utils
 cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
 EOF
 
-FROM stackable/image/stackable-devel AS containerdebug
+FROM local-image/stackable-devel AS containerdebug
 
 # Find the latest version here: https://github.com/stackabletech/containerdebug/tags
 # renovate: datasource=github-tags packageName=stackabletech/containerdebug
@@ -39,7 +39,7 @@ EOF
 FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:383329bf9c4f968e87e85d30ba3a5cb988a3bbde28b8e4932dcd3a025fd9c98c AS final
 
 # intentionally unused
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 ARG STACKABLE_USER_GID
 ARG STACKABLE_USER_NAME
diff --git a/stackable-base/boil-config.toml b/stackable-base/boil-config.toml
new file mode 100644
index 000000000..fa7f2b5ce
--- /dev/null
+++ b/stackable-base/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."1.0.0".local-images]
+stackable-devel = "1.0.0"
diff --git a/stackable-base/versions.py b/stackable-base/versions.py
deleted file mode 100644
index 6f6bf1ca7..000000000
--- a/stackable-base/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "1.0.0",
-        "stackable-devel": "1.0.0",
-    },
-]
diff --git a/stackable-devel/Dockerfile b/stackable-devel/Dockerfile
index 4606819e3..2fa805a20 100644
--- a/stackable-devel/Dockerfile
+++ b/stackable-devel/Dockerfile
@@ -14,7 +14,7 @@
 FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:383329bf9c4f968e87e85d30ba3a5cb988a3bbde28b8e4932dcd3a025fd9c98c
 
 # intentionally unused
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG STACKABLE_USER_UID
 ARG STACKABLE_USER_GID
 ARG STACKABLE_USER_NAME
diff --git a/stackable-devel/boil-config.toml b/stackable-devel/boil-config.toml
new file mode 100644
index 000000000..d5849a8d6
--- /dev/null
+++ b/stackable-devel/boil-config.toml
@@ -0,0 +1 @@
+[versions."1.0.0"]
diff --git a/stackable-devel/versions.py b/stackable-devel/versions.py
deleted file mode 100644
index ed192d92f..000000000
--- a/stackable-devel/versions.py
+++ /dev/null
@@ -1,5 +0,0 @@
-versions = [
-    {
-        "product": "1.0.0",
-    },
-]
diff --git a/superset/Dockerfile b/superset/Dockerfile
index 4d3f9fbd1..31391ce17 100644
--- a/superset/Dockerfile
+++ b/superset/Dockerfile
@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/shared/statsd-exporter AS statsd_exporter-builder
+FROM local-image/shared/statsd-exporter AS statsd_exporter-builder
 
-FROM stackable/image/stackable-base AS opa-authorizer-builder
+FROM local-image/stackable-base AS opa-authorizer-builder
 
-ARG PYTHON
+ARG PYTHON_VERSION
 
 COPY superset/stackable/opa-authorizer /tmp/opa-authorizer
 
@@ -14,9 +14,9 @@ microdnf update
 microdnf install \
     gcc \
     gcc-c++ \
-    python${PYTHON} \
-    python${PYTHON}-devel \
-    python${PYTHON}-pip
+    python${PYTHON_VERSION} \
+    python${PYTHON_VERSION}-devel \
+    python${PYTHON_VERSION}-pip
 microdnf clean all
 rm -rf /var/cache/yum
 
@@ -33,16 +33,16 @@ poetry run pytest
 poetry build
 EOF
 
-FROM stackable/image/vector AS builder
+FROM local-image/vector AS builder
 
-ARG PRODUCT
-ARG SHARED_STATSD_EXPORTER
-ARG PYTHON
-ARG AUTHLIB
+ARG PRODUCT_VERSION
+ARG SHARED_STATSD_EXPORTER_VERSION
+ARG PYTHON_VERSION
+ARG AUTHLIB_VERSION
 ARG TARGETARCH
 ARG TARGETOS
-ARG CYCLONEDX_BOM
-ARG UV
+ARG CYCLONEDX_BOM_VERSION
+ARG UV_VERSION
 
 RUN microdnf update \
     && microdnf install \
@@ -59,16 +59,16 @@ RUN microdnf update \
         libffi-devel \
         openldap-devel \
         openssl-devel \
-        python${PYTHON} \
-        python${PYTHON}-devel \
-        python${PYTHON}-pip \
-        python${PYTHON}-wheel \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-devel \
+        python${PYTHON_VERSION}-pip \
+        python${PYTHON_VERSION}-wheel \
         libpq-devel \
     && microdnf clean all && \
     rm -rf /var/cache/yum
 
-COPY superset/stackable/constraints/${PRODUCT}/constraints.txt /tmp/constraints.txt
-COPY superset/stackable/constraints/${PRODUCT}/build-constraints.txt /tmp/build-constraints.txt
+COPY superset/stackable/constraints/${PRODUCT_VERSION}/constraints.txt /tmp/constraints.txt
+COPY superset/stackable/constraints/${PRODUCT_VERSION}/build-constraints.txt /tmp/build-constraints.txt
 COPY --from=opa-authorizer-builder /tmp/opa-authorizer/dist/opa_authorizer-0.1.0-py3-none-any.whl /tmp/
 
 # Upgrade pip to the latest version
@@ -83,13 +83,13 @@ RUN python3 -m venv /stackable/app \
         --upgrade \
         setuptools==75.2.0 \
         pip \
-        uv==${UV} \
+        uv==${UV_VERSION} \
     && uv pip install \
         --no-cache-dir \
         --upgrade \
         --constraints /tmp/constraints.txt \
         --build-constraints /tmp/build-constraints.txt \
-        apache-superset==${PRODUCT} \
+        apache-superset==${PRODUCT_VERSION} \
         gevent \
         psycopg2-binary \
         statsd \
@@ -109,7 +109,7 @@ RUN python3 -m venv /stackable/app \
     # We bumped this from 21.2.0 to 22.0.0 to fix CVE-2024-1135
     # Superset 4.1.0 will contain at least 22.0.0, the bump was done in https://github.com/apache/superset/commit/4f693c6db0dc5c7286a36b8d23e90541943ff13f
     # We only want to bump this for the 4.0.x line, as the others already have updated and we don't want to accidentially downgrade the version
-    && if [[ "$PRODUCT" =~ ^4\.0\..* ]]; \
+    && if [[ "$PRODUCT_VERSION" =~ ^4\.0\..* ]]; \
         then echo "Superset 4.0.x detected, installing gunicorn 22.0.0 to fix CVE-2024-1135" \
         && uv pip install gunicorn==22.0.0; \
     fi \
@@ -117,32 +117,32 @@ RUN python3 -m venv /stackable/app \
         --no-cache-dir \
         --upgrade \
         python-json-logger \
-        cyclonedx-bom==${CYCLONEDX_BOM} \
-    && if [ -n "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi && \
+        cyclonedx-bom==${CYCLONEDX_BOM_VERSION} \
+    && if [ -n "$AUTHLIB_VERSION" ]; then pip install Authlib==${AUTHLIB_VERSION}; fi && \
     uv pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
 
 COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter /stackable/statsd_exporter
-COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER}.cdx.json
+COPY --from=statsd_exporter-builder /statsd_exporter/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json /stackable/statsd_exporter-${SHARED_STATSD_EXPORTER_VERSION}.cdx.json
 
 RUN <<EOF
 cd /stackable
-source /stackable/app/bin/activate && cyclonedx-py environment --schema-version 1.5 --outfile app/superset-${PRODUCT}.cdx.json
+source /stackable/app/bin/activate && cyclonedx-py environment --schema-version 1.5 --outfile app/superset-${PRODUCT_VERSION}.cdx.json
 chmod --recursive g=u /stackable
 EOF
 
 # Final image
-FROM stackable/image/vector
+FROM local-image/vector
 
-ARG PRODUCT
-ARG PYTHON
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG PYTHON_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Apache Superset" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Apache Superset." \
     description="This image is deployed by the Stackable Operator for Apache Superset."
 
@@ -165,7 +165,7 @@ microdnf install \
   openldap-clients \
   openssl-libs \
   openssl-pkcs11 \
-  "python${PYTHON}"
+  "python${PYTHON_VERSION}"
 
 microdnf clean all
 rm -rf /var/cache/yum
diff --git a/superset/boil-config.toml b/superset/boil-config.toml
new file mode 100644
index 000000000..93a4a3bc3
--- /dev/null
+++ b/superset/boil-config.toml
@@ -0,0 +1,36 @@
+[versions."4.0.2".local-images]
+"shared/statsd-exporter" = "0.28.0"
+stackable-base = "1.0.0"
+vector = "0.47.0"
+
+[versions."4.0.2".build-arguments]
+cyclonedx-bom-version = "6.0.0"
+# https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7
+authlib-version = "1.2.1"
+python-version = "3.9"
+uv-version = "0.7.3"
+
+[versions."4.1.1".local-images]
+"shared/statsd-exporter" = "0.28.0"
+stackable-base = "1.0.0"
+vector = "0.47.0"
+
+[versions."4.1.1".build-arguments]
+cyclonedx-bom-version = "6.0.0"
+# https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
+authlib-version = "1.2.1"
+# 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
+python-version = "3.9"
+uv-version = "0.7.3"
+
+[versions."4.1.2".local-images]
+"shared/statsd-exporter" = "0.28.0"
+stackable-base = "1.0.0"
+vector = "0.47.0"
+
+[versions."4.1.2".build-arguments]
+cyclonedx-bom-version = "6.0.0"
+# https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
+authlib-version = "1.2.1"
+python-version = "3.9"
+uv-version = "0.7.3"
diff --git a/superset/versions.py b/superset/versions.py
deleted file mode 100644
index 4ef1f3e6c..000000000
--- a/superset/versions.py
+++ /dev/null
@@ -1,32 +0,0 @@
-versions = [
-    {
-        "product": "4.0.2",
-        "python": "3.9",
-        "cyclonedx_bom": "6.0.0",
-        "vector": "0.47.0",
-        "shared/statsd-exporter": "0.28.0",
-        "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7
-        "stackable-base": "1.0.0",
-        "uv": "0.7.3",
-    },
-    {
-        "product": "4.1.1",
-        "python": "3.9",  # 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
-        "cyclonedx_bom": "6.0.0",
-        "vector": "0.47.0",
-        "shared/statsd-exporter": "0.28.0",
-        "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
-        "stackable-base": "1.0.0",
-        "uv": "0.7.3",
-    },
-    {
-        "product": "4.1.2",
-        "python": "3.9",
-        "cyclonedx_bom": "6.0.0",
-        "vector": "0.47.0",
-        "shared/statsd-exporter": "0.28.0",
-        "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
-        "stackable-base": "1.0.0",
-        "uv": "0.7.3",
-    },
-]
diff --git a/testing-tools/Dockerfile b/testing-tools/Dockerfile
index 4e2b1501f..4b12ee4b0 100644
--- a/testing-tools/Dockerfile
+++ b/testing-tools/Dockerfile
@@ -7,8 +7,8 @@
 # docker pull python:3.12-slim-bullseye and see the digest that appears in the output.
 FROM python:3.12-slim-bullseye@sha256:f6d639b794b394cbeb7a9327d5af9976f0e8d61353bcf41916984775c9bbed1a
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG KEYCLOAK_VERSION
 ARG STACKABLE_USER_UID
 ARG STACKABLE_USER_GID
@@ -17,8 +17,8 @@ ARG STACKABLE_USER_NAME
 LABEL name="Stackable Testing Tools" \
       maintainer="info@stackable.tech" \
       vendor="Stackable GmbH" \
-      version="${PRODUCT}" \
-      release="${RELEASE}" \
+      version="${PRODUCT_VERSION}" \
+      release="${RELEASE_VERSION}" \
       summary="Stackable tools for integration tests." \
       description="Used by Stackable integration tests."
 
@@ -87,6 +87,6 @@ ENV PATH=/stackable/keycloak/bin:$PATH
 
 USER ${STACKABLE_USER_UID}
 
-ENV STACKABLE_PRODUCT_VERSION=${PRODUCT}
+ENV STACKABLE_PRODUCT_VERSION=${PRODUCT_VERSION}
 
 WORKDIR /stackable
diff --git a/testing-tools/boil-config.toml b/testing-tools/boil-config.toml
new file mode 100644
index 000000000..278624036
--- /dev/null
+++ b/testing-tools/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."0.2.0".build-arguments]
+keycloak-version = "23.0.0"
diff --git a/testing-tools/versions.py b/testing-tools/versions.py
deleted file mode 100644
index 5231af218..000000000
--- a/testing-tools/versions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-versions = [
-    {
-        "product": "0.2.0",
-        "keycloak_version": "23.0.0",
-    }
-]
diff --git a/tools/Dockerfile b/tools/Dockerfile
index b283ee120..660b01ec4 100644
--- a/tools/Dockerfile
+++ b/tools/Dockerfile
@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/stackable-base
+FROM local-image/stackable-base
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG KUBECTL_VERSION
-ARG RELEASE
+ARG RELEASE_VERSION
 ARG JQ_VERSION
 ARG YQ_VERSION
 ARG TARGETARCH
@@ -14,8 +14,8 @@ ARG STACKABLE_USER_UID
 LABEL name="Stackable Tools" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="Stackable Tools for Kubernetes." \
     description="Stackable Tools for Kubernetes."
 
diff --git a/tools/boil-config.toml b/tools/boil-config.toml
new file mode 100644
index 000000000..bdb9a2443
--- /dev/null
+++ b/tools/boil-config.toml
@@ -0,0 +1,7 @@
+[versions."1.0.0".local-images]
+stackable-base = "1.0.0"
+
+[versions."1.0.0".build-arguments]
+kubectl-version = "1.33.0"
+yq-version = "4.45.2"
+jq-version = "1.7.1"
diff --git a/tools/versions.py b/tools/versions.py
deleted file mode 100644
index 78269452c..000000000
--- a/tools/versions.py
+++ /dev/null
@@ -1,9 +0,0 @@
-versions = [
-    {
-        "product": "1.0.0",
-        "kubectl_version": "1.33.0",
-        "jq_version": "1.7.1",
-        "stackable-base": "1.0.0",
-        "yq_version": "4.45.2",
-    },
-]
diff --git a/trino-cli/Dockerfile b/trino-cli/Dockerfile
index 4728a8c30..3c5d8b340 100644
--- a/trino-cli/Dockerfile
+++ b/trino-cli/Dockerfile
@@ -1,17 +1,17 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/java-base
+FROM local-image/java-base
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL name="Trino CLI" \
       maintainer="info@stackable.tech" \
       vendor="Stackable GmbH" \
-      version="${PRODUCT}" \
-      release="${RELEASE}" \
+      version="${PRODUCT_VERSION}" \
+      release="${RELEASE_VERSION}" \
       summary="The Stackable image for the Trino CLI." \
       description="This image can be used to interact with Stackable Trino deployments."
 
@@ -29,8 +29,8 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino-cli/licenses /licenses
 WORKDIR /stackable/trino-cli
 
 RUN <<EOF
-curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT}-executable.jar"
-ln -s "trino-cli-${PRODUCT}-executable.jar" trino-cli-executable.jar
+curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}-executable.jar"
+ln -s "trino-cli-${PRODUCT_VERSION}-executable.jar" trino-cli-executable.jar
 
 # All files and folders owned by root group to support running as arbitrary users.
 # This is best practice as all container users will belong to the root group (0).
diff --git a/trino-cli/boil-config.toml b/trino-cli/boil-config.toml
new file mode 100644
index 000000000..4cf2f00c9
--- /dev/null
+++ b/trino-cli/boil-config.toml
@@ -0,0 +1,2 @@
+[versions."476".local-images]
+java-base = "24"
diff --git a/trino-cli/versions.py b/trino-cli/versions.py
deleted file mode 100644
index 828f6f625..000000000
--- a/trino-cli/versions.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# This image is only used in integration tests and demos.
-# It's therefore ok if we only support a single version at a time.
-versions = [
-    {
-        "product": "476",
-        "java-base": "24",
-    },
-]
diff --git a/trino/Dockerfile b/trino/Dockerfile
index 459ec02a4..823d9fe2c 100644
--- a/trino/Dockerfile
+++ b/trino/Dockerfile
@@ -1,23 +1,23 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/trino/storage-connector AS trino-storage-connector-image
+FROM local-image/trino/storage-connector AS trino-storage-connector-image
 
-FROM stackable/image/trino/trino AS trino-builder
+FROM local-image/trino/trino AS trino-builder
 
-FROM stackable/image/java-base
+FROM local-image/java-base
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
-ARG JMX_EXPORTER
+ARG JMX_EXPORTER_VERSION
 
 LABEL \
     name="Trino" \
     maintainer="info@stackable.tech" \
     vendor="Stackable GmbH" \
-    version="${PRODUCT}" \
-    release="${RELEASE}" \
+    version="${PRODUCT_VERSION}" \
+    release="${RELEASE_VERSION}" \
     summary="The Stackable image for Trino." \
     description="This image is deployed by the Stackable Operator for Trino."
 
@@ -35,21 +35,21 @@ microdnf clean all
 rm -rf /var/cache/yum
 EOF
 
-COPY --from=trino-builder --chown=${STACKABLE_USER_UID}:0 /stackable/trino-server /stackable/trino-server-${PRODUCT}-stackable${RELEASE}
+COPY --from=trino-builder --chown=${STACKABLE_USER_UID}:0 /stackable/trino-server /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 trino/licenses /licenses
 
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT}/target/trino-storage-${PRODUCT}-stackable${RELEASE} /stackable/trino-server-${PRODUCT}-stackable${RELEASE}/plugin/trino-storage-${PRODUCT}-stackable${RELEASE}
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT}/target/bom.json /stackable/trino-server-${PRODUCT}-stackable${RELEASE}/plugin/trino-storage-${PRODUCT}-stackable${RELEASE}/trino-storage-${PRODUCT}-stackable${RELEASE}.cdx.json
-COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/src/trino-storage-connector/patchable-work/worktree/${PRODUCT_VERSION}/target/bom.json /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/plugin/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}/trino-storage-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}.cdx.json
+COPY --from=trino-storage-connector-image --chown=${STACKABLE_USER_UID}:0 /stackable/trino-storage-connector-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 trino/stackable/jmx /stackable/jmx
 
 RUN <<EOF
 # JMX Exporter
-curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar -o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
-chmod +x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar
-ln -s /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar /stackable/jmx/jmx_prometheus_javaagent.jar
-ln -s /stackable/trino-server-${PRODUCT}-stackable${RELEASE} /stackable/trino-server
+curl https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar -o /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
+chmod +x /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar
+ln -s /stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar /stackable/jmx/jmx_prometheus_javaagent.jar
+ln -s /stackable/trino-server-${PRODUCT_VERSION}-stackable${RELEASE_VERSION} /stackable/trino-server
 
 # Set correct permissions
 chown -R ${STACKABLE_USER_UID}:0 /stackable/jmx /stackable/trino-server
diff --git a/trino/boil-config.toml b/trino/boil-config.toml
new file mode 100644
index 000000000..60e3b2194
--- /dev/null
+++ b/trino/boil-config.toml
@@ -0,0 +1,23 @@
+[versions."451".local-images]
+java-base = "22"
+"trino/trino" = "451"
+"trino/storage-connector" = "451"
+
+[versions."451".build-arguments]
+jmx-exporter-version = "1.3.0"
+
+[versions."470".local-images]
+java-base = "23"
+"trino/trino" = "470"
+"trino/storage-connector" = "470"
+
+[versions."470".build-arguments]
+jmx-exporter-version = "1.3.0"
+
+[versions."476".local-images]
+java-base = "24"
+"trino/trino" = "476"
+"trino/storage-connector" = "476"
+
+[versions."476".build-arguments]
+jmx-exporter-version = "1.3.0"
diff --git a/trino/storage-connector/Dockerfile b/trino/storage-connector/Dockerfile
index b10ff4035..0156405e6 100644
--- a/trino/storage-connector/Dockerfile
+++ b/trino/storage-connector/Dockerfile
@@ -1,31 +1,31 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/trino/trino AS trino-builder
+FROM local-image/trino/trino AS trino-builder
 
-FROM stackable/image/java-devel AS storage-connector-builder
+FROM local-image/java-devel AS storage-connector-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 trino/storage-connector/stackable/patches/patchable.toml /stackable/src/trino-storage-connector/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 trino/storage-connector/stackable/patches/${PRODUCT} /stackable/src/trino-storage-connector/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 trino/storage-connector/stackable/patches/${PRODUCT_VERSION} /stackable/src/trino-storage-connector/stackable/patches/${PRODUCT_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 --from=trino-builder /stackable/patched-libs /stackable/patched-libs
 USER ${STACKABLE_USER_UID}
 
 # adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
 # hadolint ignore=SC2215
-RUN --mount=type=cache,id=maven-${PRODUCT},target=/stackable/.m2/repository,uid=${STACKABLE_USER_UID} <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout trino-storage-connector ${PRODUCT})"
+RUN --mount=type=cache,id=maven-${PRODUCT_VERSION},target=/stackable/.m2/repository,uid=${STACKABLE_USER_UID} <<EOF
+cd "$(/stackable/patchable --images-repo-root=src checkout trino-storage-connector ${PRODUCT_VERSION})"
 
 # Make Maven aware of custom Stackable libraries
 cp -r /stackable/patched-libs/maven/* /stackable/.m2/repository
 
-ORIGINAL_VERSION="${PRODUCT}"
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+ORIGINAL_VERSION="${PRODUCT_VERSION}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 # Create snapshot of the source code including custom patches
 tar -czf /stackable/trino-storage-connector-${NEW_VERSION}-src.tar.gz .
diff --git a/trino/storage-connector/boil-config.toml b/trino/storage-connector/boil-config.toml
new file mode 100644
index 000000000..d7f57e826
--- /dev/null
+++ b/trino/storage-connector/boil-config.toml
@@ -0,0 +1,11 @@
+[versions."451".local-images]
+"trino/trino" = "451"
+java-devel = "22"
+
+[versions."470".local-images]
+"trino/trino" = "470"
+java-devel = "23"
+
+[versions."476".local-images]
+"trino/trino" = "476"
+java-devel = "24"
diff --git a/trino/storage-connector/versions.py b/trino/storage-connector/versions.py
deleted file mode 100644
index d9fe35c51..000000000
--- a/trino/storage-connector/versions.py
+++ /dev/null
@@ -1,17 +0,0 @@
-versions = [
-    {
-        "product": "451",
-        "trino/trino": "451",
-        "java-devel": "22",
-    },
-    {
-        "product": "470",
-        "trino/trino": "470",
-        "java-devel": "23",
-    },
-    {
-        "product": "476",
-        "trino/trino": "476",
-        "java-devel": "24",
-    },
-]
diff --git a/trino/trino/Dockerfile b/trino/trino/Dockerfile
index 59c2d65fd..dc75f3ea4 100644
--- a/trino/trino/Dockerfile
+++ b/trino/trino/Dockerfile
@@ -1,22 +1,22 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
-FROM stackable/image/java-devel AS trino-builder
+FROM local-image/java-devel AS trino-builder
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 WORKDIR /stackable
 
 COPY --chown=${STACKABLE_USER_UID}:0 trino/trino/stackable/patches/patchable.toml /stackable/src/trino/trino/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 trino/trino/stackable/patches/${PRODUCT} /stackable/src/trino/trino/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 trino/trino/stackable/patches/${PRODUCT_VERSION} /stackable/src/trino/trino/stackable/patches/${PRODUCT_VERSION}
 
 # adding a hadolint ignore for SC2215, due to https://github.com/hadolint/hadolint/issues/980
 # hadolint ignore=SC2215
-RUN --mount=type=cache,id=maven-${PRODUCT},target=/root/.m2/repository <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout trino/trino ${PRODUCT})"
+RUN --mount=type=cache,id=maven-${PRODUCT_VERSION},target=/root/.m2/repository <<EOF
+cd "$(/stackable/patchable --images-repo-root=src checkout trino/trino ${PRODUCT_VERSION})"
 
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -38,7 +38,7 @@ git commit --allow-empty --message "Fake commit, so that we can create a tag"
 git tag ${NEW_VERSION}
 
 SKIP_PROJECTS="!docs"
-if [ "$PRODUCT" = "470" ] || [ "$PRODUCT" = "451" ]; then
+if [ "$PRODUCT_VERSION" = "470" ] || [ "$PRODUCT_VERSION" = "451" ]; then
   SKIP_PROJECTS="$SKIP_PROJECTS,!core/trino-server-rpm"
 fi
 
@@ -63,7 +63,7 @@ tar -xzf core/trino-server/target/trino-server-${NEW_VERSION}.tar.gz -C /stackab
 mv core/trino-server/target/bom.json /stackable/trino-server-${NEW_VERSION}/trino-server-${NEW_VERSION}.cdx.json
 
 # Delete intermediate build products to free some space and keep runners happy
-(cd .. && rm -r ${PRODUCT})
+(cd .. && rm -r ${PRODUCT_VERSION})
 rm -r /stackable/.m2
 
 ln -s /stackable/trino-server-${NEW_VERSION} /stackable/trino-server
diff --git a/trino/trino/boil-config.toml b/trino/trino/boil-config.toml
new file mode 100644
index 000000000..3b636f81b
--- /dev/null
+++ b/trino/trino/boil-config.toml
@@ -0,0 +1,8 @@
+[versions."451".local-images]
+java-devel = "22"
+
+[versions."470".local-images]
+java-devel = "23"
+
+[versions."476".local-images]
+java-devel = "24"
diff --git a/trino/trino/versions.py b/trino/trino/versions.py
deleted file mode 100644
index 3c67dc2b3..000000000
--- a/trino/trino/versions.py
+++ /dev/null
@@ -1,14 +0,0 @@
-versions = [
-    {
-        "product": "451",
-        "java-devel": "22",
-    },
-    {
-        "product": "470",
-        "java-devel": "23",
-    },
-    {
-        "product": "476",
-        "java-devel": "24",
-    },
-]
diff --git a/trino/versions.py b/trino/versions.py
deleted file mode 100644
index bb9a9dac8..000000000
--- a/trino/versions.py
+++ /dev/null
@@ -1,23 +0,0 @@
-versions = [
-    {
-        "product": "451",
-        "java-base": "22",
-        "trino/trino": "451",
-        "jmx_exporter": "1.3.0",
-        "trino/storage-connector": "451",
-    },
-    {
-        "product": "470",
-        "java-base": "23",
-        "trino/trino": "470",
-        "jmx_exporter": "1.3.0",
-        "trino/storage-connector": "470",
-    },
-    {
-        "product": "476",
-        "java-base": "24",
-        "trino/trino": "476",
-        "jmx_exporter": "1.3.0",
-        "trino/storage-connector": "476",
-    },
-]
diff --git a/vector/Dockerfile b/vector/Dockerfile
index a40b232e9..7705b1e30 100644
--- a/vector/Dockerfile
+++ b/vector/Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
 # check=error=true
 
-FROM stackable/image/stackable-base
+FROM local-image/stackable-base
 
-ARG PRODUCT
+ARG PRODUCT_VERSION
 ARG RPM_RELEASE
 ARG INOTIFY_TOOLS
 ARG TARGETARCH
@@ -18,10 +18,10 @@ RUN <<EOF
 ARCH="${TARGETARCH/amd64/x86_64}"
 ARCH="${ARCH/arm64/aarch64}"
 rpm --install \
-    "https://repo.stackable.tech/repository/packages/vector/vector-${PRODUCT}-${RPM_RELEASE}.${ARCH}.rpm" \
+    "https://repo.stackable.tech/repository/packages/vector/vector-${PRODUCT_VERSION}-${RPM_RELEASE}.${ARCH}.rpm" \
     "https://repo.stackable.tech/repository/packages/inotify-tools/inotify-tools-${INOTIFY_TOOLS}.${ARCH}.rpm"
 mkdir /licenses
-cp /usr/share/licenses/vector-${PRODUCT}/LICENSE /licenses/VECTOR_LICENSE
+cp /usr/share/licenses/vector-${PRODUCT_VERSION}/LICENSE /licenses/VECTOR_LICENSE
 
 # Create the directory /stackable/vector/var.
 # This directory is set by operator-rs in the parameter `data_dir`
diff --git a/vector/boil-config.toml b/vector/boil-config.toml
new file mode 100644
index 000000000..3c4366af1
--- /dev/null
+++ b/vector/boil-config.toml
@@ -0,0 +1,6 @@
+[versions."0.47.0".local-images]
+stackable-base = "1.0.0"
+
+[versions."0.47.0".build-arguments]
+inotify-tools = "3.22.1.0-1.el9"
+rpm-release = "1"
diff --git a/vector/versions.py b/vector/versions.py
deleted file mode 100644
index 828d3fc2d..000000000
--- a/vector/versions.py
+++ /dev/null
@@ -1,8 +0,0 @@
-versions = [
-    {
-        "product": "0.47.0",
-        "rpm_release": "1",
-        "stackable-base": "1.0.0",
-        "inotify_tools": "3.22.1.0-1.el9",
-    }
-]
diff --git a/zookeeper/Dockerfile b/zookeeper/Dockerfile
index 5cef69917..1093684ef 100644
--- a/zookeeper/Dockerfile
+++ b/zookeeper/Dockerfile
@@ -4,16 +4,16 @@
 # ==============================================================================
 # START ZOOKEEPER BUILDER
 
-FROM stackable/image/java-devel AS builder
+FROM local-image/java-devel AS builder
 
-ARG PRODUCT
-ARG JMX_EXPORTER
+ARG PRODUCT_VERSION
+ARG JMX_EXPORTER_VERSION
 ARG STACKABLE_USER_UID
-ARG RELEASE
+ARG RELEASE_VERSION
 
 # Copy patches into the builder
 COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/patches/patchable.toml /stackable/src/zookeeper/stackable/patches/patchable.toml
-COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/patches/${PRODUCT} /stackable/src/zookeeper/stackable/patches/${PRODUCT}
+COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/patches/${PRODUCT_VERSION} /stackable/src/zookeeper/stackable/patches/${PRODUCT_VERSION}
 # Copy JMX config into the builder
 COPY --chown=${STACKABLE_USER_UID}:0 zookeeper/stackable/jmx /stackable/jmx
 
@@ -22,10 +22,10 @@ WORKDIR /stackable
 
 # Download ZooKeeper sources from our own repo
 RUN <<EOF
-cd "$(/stackable/patchable --images-repo-root=src checkout zookeeper ${PRODUCT})"
+cd "$(/stackable/patchable --images-repo-root=src checkout zookeeper ${PRODUCT_VERSION})"
 
 ORIGINAL_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-NEW_VERSION="${PRODUCT}-stackable${RELEASE}"
+NEW_VERSION="${PRODUCT_VERSION}-stackable${RELEASE_VERSION}"
 
 mvn versions:set -DnewVersion=$NEW_VERSION
 
@@ -50,10 +50,10 @@ rm -rf /stackable/apache-zookeeper-${NEW_VERSION}-bin/docs
 rm /stackable/apache-zookeeper-${NEW_VERSION}-bin/README_packaging.md
 
 # Download the JMX exporter jar from our own repo
-curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" \
-  -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-chmod +x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
-ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
+curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" \
+  -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+chmod +x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar"
+ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
 
 # set correct groups
 chmod -R g=u /stackable
@@ -65,43 +65,43 @@ EOF
 # ==============================================================================
 # START FINAL ZOOKEEPER IMAGE
 
-FROM stackable/image/java-base
+FROM local-image/java-base
 
-ARG PRODUCT
-ARG RELEASE
+ARG PRODUCT_VERSION
+ARG RELEASE_VERSION
 ARG STACKABLE_USER_UID
 
 LABEL  \
   name="Apache ZooKeeper" \
   maintainer="info@stackable.tech" \
   vendor="Stackable GmbH" \
-  version="${PRODUCT}" \
-  release="${RELEASE}" \
+  version="${PRODUCT_VERSION}" \
+  release="${RELEASE_VERSION}" \
   summary="The Stackable image for Apache ZooKeeper." \
   description="This image is deployed by the Stackable Operator for Apache ZooKeeper."
 
 # Copy over the ZooKeeper binary folder
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/apache-zookeeper-${PRODUCT}-stackable${RELEASE}-bin /stackable/apache-zookeeper-${PRODUCT}-stackable${RELEASE}-bin/
-COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/zookeeper-${PRODUCT}-stackable${RELEASE}-src.tar.gz /stackable
+COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/apache-zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin /stackable/apache-zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/
+COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-src.tar.gz /stackable
 COPY --chown=${STACKABLE_USER_UID}:0 --from=builder /stackable/jmx /stackable/jmx/
 COPY zookeeper/licenses /licenses
 
 RUN <<EOF
 microdnf update
 microdnf clean all
-rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
+rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE_VERSION}\n" | sort > /stackable/package_manifest.txt
 chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
 chmod g=u /stackable/package_manifest.txt
 rm -rf /var/cache/yum
 
-# Add link pointing from /stackable/zookeeper to /stackable/apache-zookeeper-${PRODUCT}-stackable${RELEASE}-bin/
+# Add link pointing from /stackable/zookeeper to /stackable/apache-zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/
 # to preserve the folder name with the version.
-ln -s /stackable/apache-zookeeper-${PRODUCT}-stackable${RELEASE}-bin/ /stackable/zookeeper
+ln -s /stackable/apache-zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/ /stackable/zookeeper
 chown -h ${STACKABLE_USER_UID}:0 /stackable/zookeeper
 
 # fix missing permissions
 chmod g=u /stackable/jmx
-chmod g=u /stackable/apache-zookeeper-${PRODUCT}-stackable${RELEASE}-bin/
+chmod g=u /stackable/apache-zookeeper-${PRODUCT_VERSION}-stackable${RELEASE_VERSION}-bin/
 EOF
 
 # ----------------------------------------
diff --git a/zookeeper/boil-config.toml b/zookeeper/boil-config.toml
new file mode 100644
index 000000000..64ab0416d
--- /dev/null
+++ b/zookeeper/boil-config.toml
@@ -0,0 +1,6 @@
+[versions."3.9.3".local-images]
+java-base = "17"
+java-devel = "11"
+
+[versions."3.9.3".build-arguments]
+jmx-exporter-version = "1.3.0"
diff --git a/zookeeper/versions.py b/zookeeper/versions.py
deleted file mode 100644
index d63bfac5a..000000000
--- a/zookeeper/versions.py
+++ /dev/null
@@ -1,12 +0,0 @@
-versions = [
-    {
-        "product": "3.9.3",
-        "java-base": "17",
-        # NOTE (@NickLarsenNZ): Builds fail on Java 17, with the output:
-        # [ERROR] Failed to execute goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs (spotbugs) on project
-        # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java
-        # returned: 1 -> [Help 1]
-        "java-devel": "11",
-        "jmx_exporter": "1.3.0",
-    },
-]