diff --git a/akms-simulator/Dockerfile b/akms-simulator/Dockerfile
index ac63780cea52e95b98c29f21bc878f075278aed0..5d32ad3ea29dcf04d6a9808783fa97ce10683581 100644
--- a/akms-simulator/Dockerfile
+++ b/akms-simulator/Dockerfile
@@ -11,8 +11,7 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     make build-akms-simulator
 
-FROM ${GITLAB_PROXY}debian:12-slim as debian
-RUN apt-get update && apt-get upgrade -y
+FROM scratch
 COPY --from=builder app/artifacts/akms-simulator /usr/bin/akms-simulator
 
 EXPOSE 4444
diff --git a/etsi14module/Dockerfile b/etsi14module/Dockerfile
index d96da9fd8a1260399acb5a76214fd0fb9ebc98d6..1e9946b0f8d691a6afcb0f4484ce9371a963e893 100644
--- a/etsi14module/Dockerfile
+++ b/etsi14module/Dockerfile
@@ -12,11 +12,8 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     make build-etsi14module
 
-FROM ${GITLAB_PROXY}debian:bookworm-slim
-RUN apt-get update && apt-get upgrade -y
-
-WORKDIR /app/
-COPY --from=builder /app/artifacts/etsi14module ./etsi14module
+FROM scratch
+COPY --from=builder /app/artifacts/etsi14module /usr/bin/etsi14module
 
 EXPOSE 1414
-ENTRYPOINT ["./etsi14module"]
+ENTRYPOINT ["/usr/bin/etsi14module"]
diff --git a/goKMS/Dockerfile b/goKMS/Dockerfile
index b35bc60a0694072ed6844a413d3310a16177f81a..cb35586724bb40ea5fcdfdb17b530876d75cbaa3 100644
--- a/goKMS/Dockerfile
+++ b/goKMS/Dockerfile
@@ -13,8 +13,7 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     make build-gokms
 
-FROM ${GITLAB_PROXY}debian:12-slim as debian
-RUN apt-get update && apt-get upgrade -y
+FROM scratch
 COPY --from=builder app/artifacts/goKMS /usr/bin/goKMS
 
 EXPOSE 7030
diff --git a/quantumlayer/Dockerfile b/quantumlayer/Dockerfile
index ddffb90ede74ae74a40c028668b06d341169a6c5..4556396a407445162e4fcc6985fd048c05e66be3 100644
--- a/quantumlayer/Dockerfile
+++ b/quantumlayer/Dockerfile
@@ -12,10 +12,8 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     make build-quantumlayer
 
-FROM ${GITLAB_PROXY}debian:bookworm-slim
-WORKDIR /app/
-RUN apt-get update && apt-get upgrade -y
-COPY --from=builder /app/artifacts/quantumlayer ./quantumlayer
+FROM scratch
+COPY --from=builder /app/artifacts/quantumlayer /usr/bin/quantumlayer
 
 EXPOSE 50901
-ENTRYPOINT ["./quantumlayer"]
+ENTRYPOINT ["/usr/bin/quantumlayer"]