diff --git a/apps/immich/base/kustomization.yaml b/apps/immich/base/kustomization.yaml
index 00f2297..6bf31c7 100644
--- a/apps/immich/base/kustomization.yaml
+++ b/apps/immich/base/kustomization.yaml
@@ -3,5 +3,4 @@ kind: Kustomization
 resources:
 - ingress.yaml
 - pvc.yaml
-- service.yaml
 - immich-secret-sealed.yaml
diff --git a/apps/immich/deployment/database.yaml b/apps/immich/deployment/database.yaml
index 77beb9c..5e14769 100644
--- a/apps/immich/deployment/database.yaml
+++ b/apps/immich/deployment/database.yaml
@@ -26,6 +26,11 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/postgresql/data
               name: pgdata
+          ports:
+            - name: http
+              containerPort: 5432
+              hostPort: 5432
+              protocol: TCP
       restartPolicy: Always
       volumes:
         - name: pgdata
diff --git a/apps/immich/deployment/microservices.yaml b/apps/immich/deployment/microservices.yaml
index a4d9687..a7cfe18 100644
--- a/apps/immich/deployment/microservices.yaml
+++ b/apps/immich/deployment/microservices.yaml
@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: immich-microservices
-  name: immich-microservices
+    app: microservices
+  name: microservices
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: immich-microservices
+      app: microservices
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: immich-microservices
+        app: microservices
     spec:
       containers:
         - args:
@@ -24,7 +24,7 @@ spec:
             - secretRef:
                 name: immich-secret
           image: ghcr.io/immich-app/immich-server:release
-          name: immich-microservices
+          name: microservices
           resources: {}
           volumeMounts:
             - mountPath: /usr/src/app/upload
diff --git a/apps/immich/deployment/redis.yaml b/apps/immich/deployment/redis.yaml
index 7797a32..3d2649e 100644
--- a/apps/immich/deployment/redis.yaml
+++ b/apps/immich/deployment/redis.yaml
@@ -19,4 +19,9 @@ spec:
         - image: registry.hub.docker.com/library/redis:6.2-alpine@sha256:84882e87b54734154586e5f8abd4dce69fe7311315e2fc6d67c29614c8de2672
           name: immich-redis
           resources: {}
+          ports:
+            - name: http
+              containerPort: 6379
+              hostPort: 6379
+              protocol: TCP
       restartPolicy: Always
\ No newline at end of file
diff --git a/apps/immich/deployment/server.yaml b/apps/immich/deployment/server.yaml
index 982e393..9610ff0 100644
--- a/apps/immich/deployment/server.yaml
+++ b/apps/immich/deployment/server.yaml
@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: immich-server
-  name: immich-server
+    app: server
+  name: server
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: immich-server
+      app: server
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: immich-server
+        app: server
     spec:
       containers:
         - args:
@@ -24,11 +24,11 @@ spec:
             - secretRef:
                 name: immich-secret
           image: ghcr.io/immich-app/immich-server:release
-          name: immich-server
+          name: server
           ports:
             - name: http
               containerPort: 3001
-              hostPort: 2283
+              hostPort: 3001
               protocol: TCP
           resources: {}
           volumeMounts:
diff --git a/apps/immich/kustomization.yaml b/apps/immich/kustomization.yaml
index f303ef6..8bddda6 100644
--- a/apps/immich/kustomization.yaml
+++ b/apps/immich/kustomization.yaml
@@ -4,5 +4,6 @@ kind: Kustomization
 namespace: immich
 
 resources:
-- base
 - deployment
+- base
+- service
diff --git a/apps/immich/service/database.yaml b/apps/immich/service/database.yaml
new file mode 100644
index 0000000..ac124f6
--- /dev/null
+++ b/apps/immich/service/database.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: database
+  name: database
+spec:
+  ports:
+    - name: "http"
+      port: 5432
+      targetPort: 5432
+  selector:
+    app: database
\ No newline at end of file
diff --git a/apps/immich/service/kustomization.yaml b/apps/immich/service/kustomization.yaml
new file mode 100644
index 0000000..02111a2
--- /dev/null
+++ b/apps/immich/service/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- database.yaml
+- redis.yaml
+- server.yaml
diff --git a/apps/immich/service/redis.yaml b/apps/immich/service/redis.yaml
new file mode 100644
index 0000000..6abbabf
--- /dev/null
+++ b/apps/immich/service/redis.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: redis
+  name: redis
+spec:
+  ports:
+    - name: "http"
+      port: 6379
+      targetPort: 6379
+  selector:
+    app: redis
\ No newline at end of file
diff --git a/apps/immich/base/service.yaml b/apps/immich/service/server.yaml
similarity index 66%
rename from apps/immich/base/service.yaml
rename to apps/immich/service/server.yaml
index 7f3b8e5..c3a612d 100644
--- a/apps/immich/base/service.yaml
+++ b/apps/immich/service/server.yaml
@@ -2,12 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: immich-server
-  name: immich-server
+    app: server
+  name: server
 spec:
   ports:
     - name: "http"
       port: 2283
       targetPort: 3001
   selector:
-    app: immich-server
+    app: server
\ No newline at end of file
diff --git a/apps/nextcloud/base/deployment.yaml b/apps/nextcloud/base/deployment.yaml
index f6fd431..d7596ed 100644
--- a/apps/nextcloud/base/deployment.yaml
+++ b/apps/nextcloud/base/deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: cron
-          image: nextcloud
+          image: nextcloud:latest
           volumeMounts:
             - mountPath: /var/www/html
               name: nextcloud