diff --git a/backend/Dockerfile b/backend/Dockerfile
new file mode 100644
index 0000000..46dedc2
--- /dev/null
+++ b/backend/Dockerfile
@@ -0,0 +1,10 @@
+FROM eclipse-temurin:21-jdk-alpine as build
+WORKDIR /app
+COPY . .
+RUN ./mvnw clean package -DskipTests || true
+
+FROM eclipse-temurin:21-jre-alpine
+WORKDIR /app
+COPY --from=build /app/target/*.jar app.jar
+EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "app.jar"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 0839c4a..c4fff06 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,5 @@
-version: '3.8'
-
 services:
+
   # 1. PostgreSQL 16 Datenbank (Hybrid Multi-Tenant Storage)
   postgres:
     image: postgres:16-alpine
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..1a5fe0a
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,5 @@
+FROM node:20-alpine
+WORKDIR /app
+COPY . .
+EXPOSE 3000
+CMD ["npm", "run", "dev"]