diff --git a/kustomize/base/deployment.yaml b/kustomize/base/deployment.yaml
index 1bdb08e..3d26351 100644
--- a/kustomize/base/deployment.yaml
+++ b/kustomize/base/deployment.yaml
@@ -2,67 +2,75 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mapproxy-deployment
+  labels:
+    app: mapproxy-deployment
 spec:
+  selector:
+    matchLabels:
+      app: mapproxy-deployment
   strategy:
     type: RollingUpdate
   template:
+    metadata:
+      labels:
+        app: mapproxy-deployment
     spec:
       containers:
-      - name: mapproxy
-        image: ghcr.io/dbca-wa/mapproxy
-        imagePullPolicy: Always
-        env:
-        - name: TZ
-          value: "Australia/Perth"
-        resources:
-          requests:
-            memory: "150Mi"
-            cpu: "25m"
-          limits:
-            memory: "2Gi"
-            cpu: "1000m"
-        startupProbe:
-          httpGet:
-            path: /demo/
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 5
-          periodSeconds: 5
-          failureThreshold: 3
-          successThreshold: 1
-          timeoutSeconds: 3
-        livenessProbe:
-          httpGet:
-            path: /demo/
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 0
-          periodSeconds: 15
-          failureThreshold: 3
-          successThreshold: 1
-          timeoutSeconds: 3
-        readinessProbe:
-          httpGet:
-            path: /demo/
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 0
-          periodSeconds: 15
-          failureThreshold: 3
-          successThreshold: 1
-          timeoutSeconds: 3
-        securityContext:
-          runAsNonRoot: true
-          privileged: false
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-          readOnlyRootFilesystem: true
-        volumeMounts:
-          - name: tmpfs-ram
-            mountPath: /tmp
-            subPath: cache_data
+        - name: mapproxy
+          image: ghcr.io/dbca-wa/mapproxy
+          imagePullPolicy: Always
+          env:
+            - name: TZ
+              value: "Australia/Perth"
+          resources:
+            requests:
+              memory: "100Mi"
+              cpu: "5m"
+            limits:
+              memory: "2Gi"
+              cpu: "1000m"
+          startupProbe:
+            httpGet:
+              path: /demo/
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            failureThreshold: 3
+            successThreshold: 1
+            timeoutSeconds: 3
+          livenessProbe:
+            httpGet:
+              path: /demo/
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 15
+            failureThreshold: 3
+            successThreshold: 1
+            timeoutSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /demo/
+              port: 8080
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 15
+            failureThreshold: 3
+            successThreshold: 1
+            timeoutSeconds: 3
+          securityContext:
+            runAsNonRoot: true
+            privileged: false
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+          volumeMounts:
+            - name: tmpfs-ram
+              mountPath: /tmp
+              subPath: cache_data
       volumes:
         - name: tmpfs-ram
           emptyDir:
diff --git a/kustomize/base/service.yaml b/kustomize/base/service.yaml
index bc29e85..77ead3c 100644
--- a/kustomize/base/service.yaml
+++ b/kustomize/base/service.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-  - name: wsgi
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
+    - name: wsgi
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
diff --git a/kustomize/overlays/prod/deployment_patch.yaml b/kustomize/overlays/prod/deployment_patch.yaml
index ed99ea5..88f7881 100644
--- a/kustomize/overlays/prod/deployment_patch.yaml
+++ b/kustomize/overlays/prod/deployment_patch.yaml
@@ -2,16 +2,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mapproxy-deployment
-  labels:
-    app: mapproxy-deployment
 spec:
-  selector:
-    matchLabels:
-      app: mapproxy-deployment
   template:
-    metadata:
-      labels:
-        app: mapproxy-deployment
     spec:
       containers:
         - name: mapproxy
diff --git a/kustomize/overlays/prod/ingress.yaml b/kustomize/overlays/prod/ingress.yaml
index b99a2bb..4ff3440 100644
--- a/kustomize/overlays/prod/ingress.yaml
+++ b/kustomize/overlays/prod/ingress.yaml
@@ -5,13 +5,13 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: mapproxy.dbca.wa.gov.au
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: mapproxy-clusterip-prod
-            port:
-              number: 8080
+    - host: mapproxy.dbca.wa.gov.au
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: mapproxy-clusterip-prod
+                port:
+                  number: 8080
diff --git a/kustomize/overlays/uat/deployment_patch.yaml b/kustomize/overlays/uat/deployment_patch.yaml
index 60d42fc..9b891fa 100644
--- a/kustomize/overlays/uat/deployment_patch.yaml
+++ b/kustomize/overlays/uat/deployment_patch.yaml
@@ -2,16 +2,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mapproxy-deployment
-  labels:
-    app: mapproxy-deployment
 spec:
-  selector:
-    matchLabels:
-      app: mapproxy-deployment
   template:
-    metadata:
-      labels:
-        app: mapproxy-deployment
     spec:
       containers:
         - name: mapproxy
diff --git a/kustomize/overlays/uat/ingress.yaml b/kustomize/overlays/uat/ingress.yaml
index cd78b26..a886f60 100644
--- a/kustomize/overlays/uat/ingress.yaml
+++ b/kustomize/overlays/uat/ingress.yaml
@@ -5,13 +5,13 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: mapproxy-uat.dbca.wa.gov.au
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: mapproxy-clusterip-uat
-            port:
-              number: 8080
+    - host: mapproxy-uat.dbca.wa.gov.au
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: mapproxy-clusterip-uat
+                port:
+                  number: 8080