diff --git a/tools/packaging/Dockerfile.ubuntu-dev b/tools/packaging/Dockerfile.ubuntu-dev
index 2046ee3d2..af16f066b 100644
--- a/tools/packaging/Dockerfile.ubuntu-dev
+++ b/tools/packaging/Dockerfile.ubuntu-dev
@@ -3,7 +3,10 @@ FROM ghcr.io/romange/ubuntu-dev:20 as builder
 
 WORKDIR /build
 
-COPY . ./
+COPY ./Makefile ./CMakeLists.txt ./
+COPY src ./src
+COPY cmake ./cmake
+COPY helio ./helio
 
 RUN make release
 
@@ -12,7 +15,7 @@ RUN build-release/dragonfly --version
 RUN curl -O https://raw.githubusercontent.com/ncopa/su-exec/212b75144bbc06722fbd7661f651390dc47a43d1/su-exec.c && \
     gcc -Wall -O2 su-exec.c -o su-exec
 
-FROM ubuntu:20.04
+FROM debian:12-slim
 
 RUN --mount=type=tmpfs,target=/var/cache/apt \
     --mount=type=tmpfs,target=/var/lib/apt/lists \
diff --git a/tools/packaging/Dockerfile.ubuntu-prod b/tools/packaging/Dockerfile.ubuntu-prod
index c8c06d5fb..2b94c423c 100644
--- a/tools/packaging/Dockerfile.ubuntu-prod
+++ b/tools/packaging/Dockerfile.ubuntu-prod
@@ -15,7 +15,7 @@ RUN curl -O https://raw.githubusercontent.com/ncopa/su-exec/212b75144bbc06722fbd
 RUN /tmp/fetch_release.sh ${TARGETPLATFORM}
 
 # Now prod image
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # ARG in fact change the env vars during the build process
 # ENV persist the env vars for the built image as well.