diff --git a/apps/paperless/base/app.yaml b/apps/paperless/base/app.yaml
index e8284bc..2c35fa7 100644
--- a/apps/paperless/base/app.yaml
+++ b/apps/paperless/base/app.yaml
@@ -57,8 +57,10 @@ spec:
               value: "true"
             - name: PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD
               value: "10"
+            - name: PAPERLESS_DBHOST
+              value: database
             - name: PAPERLESS_REDIS
-              value: redis://localhost:6379
+              value: redis://redis:6379
             - name: PAPERLESS_TIME_ZONE
               value: Europe/Berlin
             - name: PAPERLESS_URL
@@ -68,15 +70,6 @@ spec:
                 secretKeyRef:
                   name: paperless-secret
                   key: PAPERLESS_SECRET_KEY
-        - image: docker.io/library/redis:7
-          name: paperless-broker
-          ports:
-            - containerPort: 6379
-              protocol: TCP
-          resources:
-            limits:
-              cpu: "0.1"
-              memory: "250M"
       restartPolicy: Always
       volumes:
         - name: paperless-pvc
diff --git a/apps/paperless/base/database.yaml b/apps/paperless/base/database.yaml
index dd2951e..ecfee24 100644
--- a/apps/paperless/base/database.yaml
+++ b/apps/paperless/base/database.yaml
@@ -2,31 +2,32 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: paperless-webserver
-  name: paperless-webserver
+    app: database
+  name: database
 spec:
   replicas: 1
   revisionHistoryLimit: 1
   selector:
     matchLabels:
-      app: paperless-webserver
+      app: database
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: paperless-webserver
+        app: database
     spec:
       containers:
         - image: docker.io/library/postgres:13
-          name: paperless-db
+          name: database
           resources: {}
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
               name: paperless-pvc
               subPath: 716a7a59-c361-48a1-ae89-f935919f7e59/pgdata
           ports:
-            - containerPort: 5432
+            - name: http
+              containerPort: 5432
               protocol: TCP
           env:
             - name: POSTGRES_DB
@@ -41,69 +42,8 @@ spec:
                 secretKeyRef:
                   name: paperless-secret
                   key: POSTGRES_PASSWORD
-        - image: ghcr.io/paperless-ngx/paperless-ngx:latest
-          name: paperless-webserver
-          ports:
-            - name: http 
-              containerPort: 8000
-              protocol: TCP
-          resources: {}
-          volumeMounts:
-            - mountPath: /usr/src/paperless/data
-              name: paperless-pvc
-              subPath: 716a7a59-c361-48a1-ae89-f935919f7e59/app
-            - mountPath: /usr/src/paperless/media
-              name: paperless-media
-            - mountPath: /usr/src/paperless/consume
-              name: paperless-pvc
-              subPath: 716a7a59-c361-48a1-ae89-f935919f7e59/consume
-          env:
-            - name: DEBUG
-              value: "false"
-            - name: PAPERLESS_ALLOWED_HOSTS
-              value: steffenillium.de,localhost
-            - name: PAPERLESS_CONSUMER_POLLING
-              value: "20"
-            - name: PAPERLESS_CONSUMER_RECURSIVE
-              value: "true"
-            - name: PAPERLESS_CORS_ALLOWED_HOSTS
-              value: http://localhost:8000
-            - name: PAPERLESS_DBHOST
-              value: localhost
-            - name: PAPERLESS_ENABLE_HTTP_REMOTE_USER
-              value: "true"
-            - name: PAPERLESS_OCR_LANGUAGE
-              value: deu
-            - name: PAPERLESS_OCR_LANGUAGES
-              value: eng deu
-            - name: PAPERLESS_OCR_ROTATE_PAGES
-              value: "true"
-            - name: PAPERLESS_OCR_ROTATE_PAGES_THRESHOLD
-              value: "10"
-            - name: PAPERLESS_REDIS
-              value: redis://localhost:6379
-            - name: PAPERLESS_TIME_ZONE
-              value: Europe/Berlin
-            - name: PAPERLESS_URL
-              value: https://documents.steffenillium.de
-            - name: PAPERLESS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: paperless-secret
-                  key: PAPERLESS_SECRET_KEY
-        - image: docker.io/library/redis:7
-          name: paperless-broker
-          ports:
-            - containerPort: 6379
-              protocol: TCP
-          resources: {}
       restartPolicy: Always
       volumes:
         - name: paperless-pvc
           persistentVolumeClaim:
             claimName: paperless-pvc
-        - name:  paperless-media
-          nfs:
-            server: 192.168.178.4
-            path: /mnt/storage/service/paperless/media
-            readOnly: false
diff --git a/apps/paperless/base/ingress.yaml b/apps/paperless/base/ingress.yaml
index f8582b6..65f7224 100644
--- a/apps/paperless/base/ingress.yaml
+++ b/apps/paperless/base/ingress.yaml
@@ -1,7 +1,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: paperless-ingress
+  name: paperless
   namespace: paperless
 spec:
   entryPoints:
@@ -11,5 +11,5 @@ spec:
   - match: Host(`documents.steffenillium.de`)
     kind: Rule
     services:
-    - name: paperless-service
+    - name: paperless
       port: http
diff --git a/apps/paperless/base/redis-service.yaml b/apps/paperless/base/redis-service.yaml
new file mode 100644
index 0000000..0755237
--- /dev/null
+++ b/apps/paperless/base/redis-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+spec:
+  ports:
+    - name: redis
+      port: 6379
+      targetPort: redis
+  selector:
+    app: redis
diff --git a/apps/paperless/base/redis.yaml b/apps/paperless/base/redis.yaml
new file mode 100644
index 0000000..766c2b5
--- /dev/null
+++ b/apps/paperless/base/redis.yaml
@@ -0,0 +1,31 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: redis
+  name: redis
+spec:
+  replicas: 1
+  revisionHistoryLimit: 1
+  selector:
+    matchLabels:
+      app: redis
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+        - image: redis:alpine
+          name: redis
+          resources:
+            limits: {}
+          ports:
+            - name: redis
+              containerPort: 6379
+              protocol: TCP
+      
+      restartPolicy: Always
+           
\ No newline at end of file