diff --git a/kustomize/bases/nextcloud/collabora-deployment.yaml b/kustomize/bases/nextcloud/collabora-deployment.yaml
new file mode 100644
index 0000000..7aedd54
--- /dev/null
+++ b/kustomize/bases/nextcloud/collabora-deployment.yaml
@@ -0,0 +1,53 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: collabora
+  labels:
+      app.kubernetes.io/component: collabora
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: collabora
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: collabora
+    spec:
+      containers:
+        - name: collabora
+          image: collabora/code
+          env:
+            - name: server_name
+              value: ${NEXTCLOUD_EXTERNAL_HOST}
+            - name: extra_params
+              value: --o:ssl.enable=false --o:ssl.termination=true
+            - name: DONT_GEN_SSL_CERT
+              value: "true"
+          ports:
+            - name: http
+              containerPort: 9980
+          securityContext:
+            capabilities:
+              add:
+                - MKNOD
+          resources:
+            requests:
+              cpu: 500m
+              memory: 1Gi
+            limits:
+              cpu: 1000m
+              memory: 1Gi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: collabora
+  labels:
+    app.kubernetes.io/component: collabora
+spec:
+  selector:
+    app.kubernetes.io/component: collabora
+  ports:
+    - name: http
+      port: 80
+      targetPort: http
\ No newline at end of file
diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml
index 0422fe1..146d70f 100644
--- a/kustomize/bases/nextcloud/kustomization.yaml
+++ b/kustomize/bases/nextcloud/kustomization.yaml
@@ -2,6 +2,7 @@ resources:
   - ../postgres
   - ../redis
   - nextcloud-deployment.yaml
+  - collabora-deployment.yaml
   - nextcloud-cronjob.yaml
   - previewgenerator-cronjob.yaml
   - nextcloud-ingress.yaml
@@ -31,6 +32,11 @@ replacements:
           name: server
         fieldPaths:
           - spec.rules.0.host
+      - select:
+          kind: Deployment
+          name: collabora
+        fieldPaths:
+          - spec.template.spec.containers.0.env.0.value
 
 patches:
 - patch: |-
diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
index ac73a61..301fe10 100644
--- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
@@ -110,6 +110,9 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: server-pvc
+  labels:
+    app.kubernetes.io/name: nextcloud
+    app.kubernetes.io/component: server
 spec:
   accessModes:
     - ReadWriteOnce
@@ -123,9 +126,11 @@ metadata:
   name: server
   labels:
     app.kubernetes.io/name: nextcloud
+    app.kubernetes.io/component: server
 spec:
   selector:
     app.kubernetes.io/name: nextcloud
+    app.kubernetes.io/component: server
   ports:
     - name: http
       port: 80
diff --git a/kustomize/bases/nextcloud/nextcloud-ingress.yaml b/kustomize/bases/nextcloud/nextcloud-ingress.yaml
index f5d3301..70d0fa7 100644
--- a/kustomize/bases/nextcloud/nextcloud-ingress.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-ingress.yaml
@@ -17,3 +17,31 @@ spec:
             name: server
             port:
               name: http
+      - path: /browser
+        pathType: Prefix
+        backend:
+          service:
+            name: collabora
+            port:
+              name: http
+      - path: /hosting/discovery
+        pathType: Prefix
+        backend:
+          service:
+            name: collabora
+            port:
+              name: http
+      - path: /hosting/capabilities
+        pathType: Prefix
+        backend:
+          service:
+            name: collabora
+            port:
+              name: http
+      - path: /cool
+        pathType: Prefix
+        backend:
+          service:
+            name: collabora
+            port:
+              name: http