diff --git a/apps/immich/README.md b/apps/immich/README.md
index 5787be4..83d15f5 100644
--- a/apps/immich/README.md
+++ b/apps/immich/README.md
@@ -1 +1,7 @@
 # Immich App
+
+## To Do
+
+- We need a full uninstall script.
+- We need full backup and restore scripts.
+- When recreating the app (uninstall/reinstall), db-init needs to re-run (currently the previous one blocks).
diff --git a/apps/immich/init/db-init-job.yaml b/apps/immich/db-init-job.yaml
similarity index 72%
rename from apps/immich/init/db-init-job.yaml
rename to apps/immich/db-init-job.yaml
index 4ce3854..f22eb42 100644
--- a/apps/immich/init/db-init-job.yaml
+++ b/apps/immich/db-init-job.yaml
@@ -29,9 +29,24 @@ spec:
               
               # Connect to the immich database and enable required extensions
               PGPASSWORD=${POSTGRES_ADMIN_PASSWORD} psql -h ${DB_HOSTNAME} -U postgres -d ${DB_DATABASE_NAME} <<EOF
-              CREATE EXTENSION IF NOT EXISTS vector;
-              CREATE EXTENSION IF NOT EXISTS cube;
-              CREATE EXTENSION IF NOT EXISTS earthdistance;
+              DO \$\$
+              BEGIN
+                -- Create vector extension if it doesn't exist
+                IF NOT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'vector') THEN
+                  CREATE EXTENSION vector;
+                END IF;
+                
+                -- Create cube extension if it doesn't exist
+                IF NOT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'cube') THEN
+                  CREATE EXTENSION cube;
+                END IF;
+                
+                -- Create earthdistance extension if it doesn't exist (depends on cube)
+                IF NOT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'earthdistance') THEN
+                  CREATE EXTENSION earthdistance;
+                END IF;
+              END
+              \$\$;
               EOF
           env:
             - name: POSTGRES_ADMIN_PASSWORD
diff --git a/apps/immich/init/kustomization.yaml b/apps/immich/init/kustomization.yaml
deleted file mode 100644
index 0630596..0000000
--- a/apps/immich/init/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - db-init-job.yaml
\ No newline at end of file
diff --git a/apps/immich/kustomization.yaml b/apps/immich/kustomization.yaml
index a6d5ab8..6e789d7 100644
--- a/apps/immich/kustomization.yaml
+++ b/apps/immich/kustomization.yaml
@@ -6,14 +6,14 @@ labels:
     pairs:
       app: immich
       managedBy: kustomize
-      partOf: sovereign-cloud
+      partOf: wild-cloud
 resources:
   - deployment.yaml
   - ingress.yaml
   - namespace.yaml
   - pvc.yaml
   - service.yaml
-  - init/
+  - db-init-job.yaml
 configMapGenerator:
   - name: config
     envs:
@@ -84,4 +84,4 @@ replacements:
           kind: Deployment
           name: immich-machine-learning
         fieldPaths:
-          - spec.template.spec.containers.0.image
\ No newline at end of file
+          - spec.template.spec.containers.0.image
diff --git a/apps/immich/service.yaml b/apps/immich/service.yaml
index 476f257..131a865 100644
--- a/apps/immich/service.yaml
+++ b/apps/immich/service.yaml
@@ -13,6 +13,8 @@ spec:
   selector:
     app: immich
     component: server
+    managedBy: kustomize
+    partOf: wild-cloud
 ---
 apiVersion: v1
 kind: Service
@@ -27,3 +29,5 @@ spec:
   selector:
     app: immich
     component: machine-learning
+    managedBy: kustomize
+    partOf: wild-cloud