diff --git a/Dockerfile b/Dockerfile
index e04ed2f7..e060138c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM alpine:3.22 AS svelte_build
 RUN apk add npm
 RUN adduser -Dh /home/svelte svelte
-ADD . /home/svelte/Umbrella
+ADD frontend /home/svelte/Umbrella/frontend
 RUN chown -R svelte /home/svelte/Umbrella
 USER svelte
 WORKDIR /home/svelte/Umbrella/frontend
 RUN npm install && npm run build
 
 
-FROM alpine AS java_build
-RUN apk add gradle fontconfig font-opensans openjdk21-jre
+FROM alpine:3.22 AS java_build
+RUN apk add gradle
 ADD . /Umbrella
 WORKDIR /Umbrella
 COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
@@ -17,14 +17,18 @@ RUN gradle --no-daemon build
 
 
 FROM alpine
-RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint
-RUN adduser -D umbrella
-COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
-RUN chown -R umbrella /home/umbrella
-ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
+RUN apk --no-cache add bash fontconfig font-opensans graphviz openjdk21-jre tzdata weasyprint \
+ && adduser -D umbrella
 WORKDIR /home/umbrella
-RUN chmod a+rx plantuml.jar && ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
-USER umbrella
-RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
+
 EXPOSE 80
 CMD java -jar jar/backend.jar
+
+ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
+COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
+RUN mkdir .config \
+ && ln -s /host/config.json .config/Umbrella.json \
+ && chmod a+rx plantuml.jar \
+ && chown -R umbrella . \
+ && ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+USER umbrella
diff --git a/Svelte/Dockerfile b/Svelte/Dockerfile
index 91916bf5..202d8cd7 100644
--- a/Svelte/Dockerfile
+++ b/Svelte/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.22
-LABEL Maintainer "Stephan Richter <s.richter@srsoftware.de>"
+LABEL Maintainer "Stephan Richter"
 ARG UID=1000
 ARG GID=1000
 RUN apk add bash npm
diff --git a/web/build.gradle.kts b/web/build.gradle.kts
index 46fd1754..51f91fa9 100644
--- a/web/build.gradle.kts
+++ b/web/build.gradle.kts
@@ -9,4 +9,5 @@ tasks.processResources {
     from("../frontend/dist") {
         into("web")
     }
-}
\ No newline at end of file
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}