diff --git a/Dockerfile b/Dockerfile
index 936c235..97b6662 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,13 +21,16 @@
 #!BuildTag: opensuse/postgres:%%pg_minor_version%%
 #!BuildTag: opensuse/postgres:latest
 
-FROM opensuse/tumbleweed:latest
+FROM opensuse/bci/bci-micro:latest AS target
+FROM opensuse/tumbleweed:latest AS builder
+COPY --from=target / /target
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends libpq5 postgresql16-server findutils; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends libpq5 postgresql16-server findutils coreutils sed util-linux; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
-
+FROM opensuse/bci/bci-micro:latest
+COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 16"
diff --git a/postgres-16-image.changes b/postgres-16-image.changes
index 956008e..81677ec 100644
--- a/postgres-16-image.changes
+++ b/postgres-16-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 14 17:06:30 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- switch to multistage build
+
 -------------------------------------------------------------------
 Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>