diff --git a/workloads/nextcloud/nextcloud-deploy.yml b/workloads/nextcloud/nextcloud-deploy.yml
index 939cff5..8e01b96 100644
--- a/workloads/nextcloud/nextcloud-deploy.yml
+++ b/workloads/nextcloud/nextcloud-deploy.yml
@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -16,6 +17,7 @@ spec:
         app: nextcloud
     spec:
       containers:
+<<<<<<< HEAD
         - image: nextcloud:17.0.3-apache
           imagePullPolicy: IfNotPresent
           name: nextcloud
@@ -58,7 +60,51 @@ spec:
             - name: nextcloud-data
               mountPath: /var/www/html
       volumes:
+=======
+      - image: nextcloud:18.0.1-apache
+        imagePullPolicy: IfNotPresent
+        name: nextcloud
+        env:
+        - name: POSTGRES_DB
+          value: nextcloud
+        - name: POSTGRES_HOST
+          value: postgres:5432
+        - name: POSTGRES_USER
+          valueFrom:
+            secretKeyRef:
+              name: postgres
+              key: POSTGRES_USER
+        - name: POSTGRES_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: postgres
+              key: POSTGRES_PASSWORD
+        - name: REDIS_HOST
+          value: redis
+        - name: REDIS_HOST_PORT
+          value: "6379"
+        resources:
+          requests:
+            memory: "1024Mi"
+            cpu: "100m"
+          limits:
+            memory: "4096Mi"
+        livenessProbe:
+          tcpSocket:
+            port: 80
+          initialDelaySeconds: 15
+          periodSeconds: 30
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 2
+        ports:
+        - containerPort: 80
+        volumeMounts:
+>>>>>>> 0f8184907bd84f04faf5546e9dfea5d04ad20df7
         - name: nextcloud-data
-          hostPath:
-            path: /opt/nextcloud/pod
-            type: Directory
+          mountPath: /var/www/html
+      volumes:
+      - name: nextcloud-data
+        hostPath:
+          path: /opt/nextcloud/pod
+          type: Directory