diff --git a/Dockerfile b/Dockerfile
index b8b7333..d0cacc4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,11 @@
-<<<<<<< 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
@@ -33,27 +25,4 @@ ENV PORT=8080
 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"]
diff --git a/README.md b/README.md
index 3696cbb..a789256 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,30 @@ node dist-server/server.js
 
 Open http://localhost:8080 in your browser.
 
+## Docker Registry
+
+The container image is hosted at `git.kgessner.de/keviin/logmaster`.
+
+### Build and push (for CI/CD or manual updates)
+
+```bash
+# 1. Build the image
+docker build -t git.kgessner.de/keviin/logmaster:latest .
+
+# 2. Login to Gitea registry (token: 2c3ea75b8936818174770592d217a3b6bfdbb4cd)
+echo 2c3ea75b8936818174770592d217a3b6bfdbb4cd | docker login git.kgessner.de -u Keviin --password-stdin
+
+# 3. Push
+docker push git.kgessner.de/keviin/logmaster:latest
+```
+
+### Pull and run
+
+```bash
+docker pull git.kgessner.de/keviin/logmaster:latest
+docker run -d -p 8080:8080 -e LOG_MODE=both git.kgessner.de/keviin/logmaster:latest
+```
+
 ## Modes
 
 | Mode | Command | Port | Description |