diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml
new file mode 100644
index 0000000..22fb5d2
--- /dev/null
+++ b/.gitea/workflows/docker-build.yml
@@ -0,0 +1,17 @@
+name: Docker Build & Push
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build & Push to Gitea Registry
+        run: |
+          echo "${{ secrets.GITEATOKEN }}" | docker login git.kgessner.de --username luiiCode --password-stdin
+          docker build -t git.kgessner.de/keviin/logmaster:latest .
+          docker push git.kgessner.de/keviin/logmaster:latest
diff --git a/.trigger b/.trigger
new file mode 100644
index 0000000..0d7ae64
--- /dev/null
+++ b/.trigger
@@ -0,0 +1 @@
+Sun May 24 13:49:40 CEST 2026
diff --git a/Dockerfile b/Dockerfile
index 0cdd8b0..b8b7333 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,19 @@
+<<<<<<< HEAD
 FROM node:20-alpine AS builder
 WORKDIR /app
 COPY package.json package-lock.json* ./
+=======
+# ── Build-Stage: TypeScript kompilieren ───────────────────────────
+FROM node:20-alpine AS builder
+WORKDIR /app
+COPY package*.json ./
+>>>>>>> 6df1dedbe8ca9558f5643432b61d49cd826e0ed5
 RUN npm ci
 COPY tsconfig.server.json ./
 COPY src/server/ ./src/server/
 RUN npx tsc -p tsconfig.server.json
 
+<<<<<<< HEAD
 FROM node:20-alpine
 WORKDIR /app
 RUN apk add --no-cache bzip2 xz zstd
@@ -27,4 +35,25 @@ ENV HOST=0.0.0.0
 EXPOSE 8080
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
   CMD wget -qO- http://localhost:8080/api/health || exit 1
+=======
+# ── Production-Stage: Minimal, kein Electron ──────────────────────
+FROM node:20-alpine
+WORKDIR /app
+
+RUN addgroup -S logviewer && adduser -S logviewer -G logviewer
+
+COPY package*.json ./
+# Installiere OHNE Electron (wird für Server-Mode nicht gebraucht)
+RUN npm ci --omit=dev && npm uninstall electron && npm cache clean --force
+
+COPY --from=builder /app/dist-server/ ./dist-server/
+COPY src/web/ ./src/web/
+
+RUN mkdir -p /app/collector-data /app/monitor-data && \
+    chown -R logviewer:logviewer /app
+
+EXPOSE 8080
+ENV HOST=0.0.0.0 PORT=8080 LOG_MODE=both
+USER logviewer
+>>>>>>> 6df1dedbe8ca9558f5643432b61d49cd826e0ed5
 CMD ["node", "dist-server/server.js"]