diff --git a/backend/hermes/docker-compose.yml b/backend/hermes/docker-compose.yml
index 81e1a84..9a42c66 100644
--- a/backend/hermes/docker-compose.yml
+++ b/backend/hermes/docker-compose.yml
@@ -1,40 +1,21 @@
 services:
-
-  postgres:
-    image: postgres:17
-
-    container_name: hermes-postgres
-
-    restart: unless-stopped
-
-    environment:
-      POSTGRES_DB: olympus
-      POSTGRES_USER: olympus
-      POSTGRES_PASSWORD: olympus123
-
-    ports:
-      - "5432:5432"
-
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-
   hermes:
     build: .
-
     container_name: hermes-api
-
     restart: unless-stopped
 
-    depends_on:
-      - postgres
-
     environment:
-      DATABASE_URL: postgresql+psycopg://olympus:olympus123@postgres:5432/olympus
+      DATABASE_URL: postgresql+psycopg://olympus:FsFs03285310!!!@olympus-db:5432/olympus
       APP_NAME: Hermes API
       APP_VERSION: 0.1.0
 
     ports:
       - "8000:8000"
 
-volumes:
-  postgres_data:
\ No newline at end of file
+    networks:
+      - default
+      - olympus-network
+
+networks:
+  olympus-network:
+    external: true
diff --git a/frontend/athena/.dockerignore b/frontend/athena/.dockerignore
new file mode 100644
index 0000000..d1625e6
--- /dev/null
+++ b/frontend/athena/.dockerignore
@@ -0,0 +1,7 @@
+node_modules
+.next
+.git
+.gitignore
+README.md
+Dockerfile
+docker-compose.yml
diff --git a/frontend/athena/Dockerfile b/frontend/athena/Dockerfile
new file mode 100644
index 0000000..16979b8
--- /dev/null
+++ b/frontend/athena/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:22-alpine
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci
+
+COPY . .
+
+RUN npm run build
+
+EXPOSE 3000
+
+CMD ["npm", "run", "start"]
diff --git a/frontend/athena/docker-compose.yml b/frontend/athena/docker-compose.yml
new file mode 100644
index 0000000..0d8decc
--- /dev/null
+++ b/frontend/athena/docker-compose.yml
@@ -0,0 +1,12 @@
+services:
+  athena:
+    build: .
+    container_name: athena-web
+    restart: unless-stopped
+
+    environment:
+      NODE_ENV: production
+      NEXT_PUBLIC_API_URL: https://api.funktechnik-schubert.de
+
+    ports:
+      - "3001:3000"