diff --git a/Dockerfile b/Dockerfile
index 608c3bd..0feb6fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,10 @@
 FROM eclipse-temurin:21-jre
+
+# Zeitzone auf Berlin setzen und 24h-Format konfigurieren
+ENV TZ=Europe/Berlin
+ENV LC_TIME=de_DE.UTF-8
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 COPY target/*.jar app.jar
 EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "/app.jar", "--spring.profiles.active=production"]
diff --git a/pom.xml b/pom.xml
index 923251c..b31a52f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.assecutor.votianlt</groupId>
     <artifactId>votianlt</artifactId>
-    <version>0.9.2</version>
+    <version>0.9.4</version>
 
     <packaging>jar</packaging>
 
diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle
index 8f32f38..e6c6d53 100644
Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ
diff --git a/src/main/java/de/assecutor/votianlt/pages/view/AddJobView.java b/src/main/java/de/assecutor/votianlt/pages/view/AddJobView.java
index df48192..48c2a71 100644
--- a/src/main/java/de/assecutor/votianlt/pages/view/AddJobView.java
+++ b/src/main/java/de/assecutor/votianlt/pages/view/AddJobView.java
@@ -520,6 +520,7 @@ public class AddJobView extends Main {
         H3 pickupApptTitle = new H3("Termin (Abholung)");
         pickupApptTitle.getStyle().set("margin", "0");
         pickupTime = new TimePicker("Uhrzeit");
+        pickupTime.setLocale(java.util.Locale.GERMANY);
         HorizontalLayout pickupApptRow = new HorizontalLayout(pickupDate, pickupTime);
         pickupApptRow.setWidthFull();
         pickupApptRow.setSpacing(true);
@@ -531,6 +532,7 @@ public class AddJobView extends Main {
         H3 deliveryApptTitle = new H3("Termin (Lieferung)");
         deliveryApptTitle.getStyle().set("margin", "0");
         deliveryTime = new TimePicker("Uhrzeit");
+        deliveryTime.setLocale(java.util.Locale.GERMANY);
         HorizontalLayout deliveryApptRow = new HorizontalLayout(deliveryDate, deliveryTime);
         deliveryApptRow.setWidthFull();
         deliveryApptRow.setSpacing(true);