diff --git a/CITATION.cff b/CITATION.cff
index 2057498..f41bc48 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -22,5 +22,5 @@ keywords:
   - self-hosted
   - portabase
 license: Apache-2.0
-version: 1.0.4-rc.7
+version: 1.0.4-rc.8
 date-released: "2026-01-28"
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 316bf10..a501651 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1595,7 +1595,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portabase-agent"
-version = "1.0.4-rc.6"
+version = "1.0.4-rc.7"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 8ed8770..7c712b5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "portabase-agent"
-version = "1.0.4-rc.7"
+version = "1.0.4-rc.8"
 edition = "2024"
 
 [dependencies]
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cd410dc..d80d8bc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -271,6 +271,36 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+
+# =========================
+# PostgreSQL client binaries (versions 12-18)
+# =========================
+RUN for v in 12 13 14 15 16 17 18; do mkdir -p /usr/lib/postgresql/$v/bin; done
+
+COPY assets/tools/amd64/postgresql/ /tmp/pg-x64/
+COPY assets/tools/arm64/postgresql/ /tmp/pg-arm/
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+        for v in 12 13 14 15 16 17 18; do \
+            cp -r /tmp/pg-x64/postgresql-$v/bin/* /usr/lib/postgresql/$v/bin/; \
+        done; \
+    else \
+        for v in 12 13 14 15 16 17 18; do \
+            cp -r /tmp/pg-arm/postgresql-$v/bin/* /usr/lib/postgresql/$v/bin/; \
+        done; \
+    fi && \
+    rm -rf /tmp/pg-x64 /tmp/pg-arm && \
+    chmod +x /usr/lib/postgresql/*/bin/*
+
+# =========================
+# MongoDB client binaries
+# =========================
+COPY assets/tools/${TARGETARCH}/mongodb/ /usr/local/mongodb/
+RUN chmod +x /usr/local/mongodb/bin/*
+
+
+
+
 WORKDIR /app
 
 # =========================