diff --git a/Dockerfile.db b/Dockerfile.db
index 38d8ca7..da251fe 100644
--- a/Dockerfile.db
+++ b/Dockerfile.db
@@ -1,7 +1,11 @@
-FROM scratch
+FROM alpine
 ADD db /db
 RUN echo -e "root:x:0:0:root:/:\nappuser:x:1000:1000:appuser:/:" > /etc/passwd
 RUN echo -e "root:x:0:root\nappuser:x:1000:" > /etc/group
+FROM scratch
+COPY --from=0 /db /db
+COPY --from=0 /etc/passwd /etc/
+COPY --from=0 /etc/group /etc/
 USER appuser
 EXPOSE 8080
 ENTRYPOINT ["/db"]
diff --git a/Dockerfile.srv b/Dockerfile.srv
index 38d8ca7..600c061 100644
--- a/Dockerfile.srv
+++ b/Dockerfile.srv
@@ -1,7 +1,11 @@
-FROM scratch
-ADD db /db
+FROM alpine
+ADD srv /srv
 RUN echo -e "root:x:0:0:root:/:\nappuser:x:1000:1000:appuser:/:" > /etc/passwd
 RUN echo -e "root:x:0:root\nappuser:x:1000:" > /etc/group
+FROM scratch
+COPY --from=0 /srv /srv
+COPY --from=0 /etc/passwd /etc/
+COPY --from=0 /etc/group /etc/
 USER appuser
 EXPOSE 8080
-ENTRYPOINT ["/db"]
+ENTRYPOINT ["/srv"]