diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd53196..34f7095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## r6 - 2024-09-10
+
+### Added
+- Included the `rustfmt` component with the Rust installation.
+
+### Changed
+- Switched base system from `bitnami/minideb:bookworm` to `debian:12.7-slim`.
+
 ## r5 - 2024-09-05
 
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index c1673b8..d30e7c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Debian Version
-ARG DEBIAN_VERS=bitnami/minideb:bookworm
+ARG DEBIAN_VERS=debian:12.7-slim
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Stage #1
@@ -9,18 +9,23 @@ FROM $DEBIAN_VERS AS build
 # Rust version
 ARG RUST_VERSION=1.81.0
 
+# Set up environment
 ENV DEBIAN_FRONTEND=noninteractive
+ENV CARGO_HOME=/opt/rust/cargo 
+ENV RUSTUP_HOME=/opt/rust/rustup
 
 # Install build dependencies
-RUN install_packages \
-    ca-certificates \
-    curl \
-    rdfind
+RUN apt-get update -qq \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        rdfind \
+    && rm -r /var/lib/apt/lists /var/cache/apt/archives
 
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | \
-        CARGO_HOME=/opt/rust/cargo RUSTUP_HOME=/opt/rust/rustup \
-        sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \
+    sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \
+    && ${CARGO_HOME}/bin/rustup component add rustfmt \
     && rdfind -makeresultsfile false -makesymlinks true /opt/rust/
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -31,12 +36,14 @@ FROM $DEBIAN_VERS
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install runtime dependencies
-RUN install_packages \
-    ca-certificates \
-    gcc \
-    libclang-dev \
-    libtss2-dev \
-    pkg-config
+RUN apt-get update -qq \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        gcc \
+        libclang-dev \
+        libtss2-dev \
+        pkg-config \
+    && rm -r /var/lib/apt/lists /var/cache/apt/archives
 
 # Copy Rust/Cargo files
 COPY --from=build /opt/rust/ /opt/rust/
diff --git a/README.md b/README.md
index ebe52e3..00eff18 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Version history
 
 | **Release** | **Date**   | **Base system**                | **Rust toolchain** | **TPM2 Software Stack** |
 | ----------- | ---------- | ------------------------------ | ------------------ | ----------------------- |
+| r6          | 2024-09-10 | Debian 12.7, 2024-09-05        | 1.81.0             | 3.2.1-3                 |
 | r5          | 2024-09-05 | Minideb "Bookworm", 2024-08-31 | 1.81.0             | 3.2.1-3                 |
 | r4          | 2024-08-31 | Minideb "Bookworm", 2024-08-31 | 1.80.0             | 3.2.1-3                 |
 | r3          | 2024-08-30 | Debian 12, 2024-08-12          | 1.80.0             | 3.2.1-3                 |