diff --git a/kubernetes/apps/default/coder/app/externalsecret.yaml b/kubernetes/apps/coder/coder/app/externalsecret.yaml
similarity index 97%
rename from kubernetes/apps/default/coder/app/externalsecret.yaml
rename to kubernetes/apps/coder/coder/app/externalsecret.yaml
index 0dadf48..9d86849 100644
--- a/kubernetes/apps/default/coder/app/externalsecret.yaml
+++ b/kubernetes/apps/coder/coder/app/externalsecret.yaml
@@ -4,7 +4,6 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: coder
-  namespace: default
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
diff --git a/kubernetes/apps/default/coder/app/helmrelease.yaml b/kubernetes/apps/coder/coder/app/helmrelease.yaml
similarity index 97%
rename from kubernetes/apps/default/coder/app/helmrelease.yaml
rename to kubernetes/apps/coder/coder/app/helmrelease.yaml
index bf8038c..fdf2e9b 100644
--- a/kubernetes/apps/default/coder/app/helmrelease.yaml
+++ b/kubernetes/apps/coder/coder/app/helmrelease.yaml
@@ -20,9 +20,8 @@ spec:
   upgrade:
     cleanupOnFail: true
     remediation:
+      strategy: rollback
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     coder:
       podAnnotations:
diff --git a/kubernetes/apps/default/coder/app/kustomization.yaml b/kubernetes/apps/coder/coder/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/default/coder/app/kustomization.yaml
rename to kubernetes/apps/coder/coder/app/kustomization.yaml
diff --git a/kubernetes/apps/default/coder/ks.yaml b/kubernetes/apps/coder/coder/ks.yaml
similarity index 88%
rename from kubernetes/apps/default/coder/ks.yaml
rename to kubernetes/apps/coder/coder/ks.yaml
index e8e5a9a..46d0d9a 100644
--- a/kubernetes/apps/default/coder/ks.yaml
+++ b/kubernetes/apps/coder/coder/ks.yaml
@@ -6,14 +6,14 @@ metadata:
   name: &app coder
   namespace: flux-system
 spec:
-  targetNamespace: default
+  targetNamespace: coder
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets-stores
     - name: crunchy-postgres-operator-cluster
-  path: ./kubernetes/apps/default/coder/app
+  path: ./kubernetes/apps/coder/coder/app
   prune: false
   sourceRef:
     kind: GitRepository
diff --git a/kubernetes/apps/coder/kustomization.yaml b/kubernetes/apps/coder/kustomization.yaml
new file mode 100644
index 0000000..053d6f9
--- /dev/null
+++ b/kubernetes/apps/coder/kustomization.yaml
@@ -0,0 +1,9 @@
+---
+# yaml-language-server: $schema=https://json.schemastore.org/kustomization.json
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  # Pre Flux-Kustomizations
+  - ./namespace.yaml
+  # Flux-Kustomizations
+  - ./coder/ks.yaml
diff --git a/kubernetes/apps/coder/namespace.yaml b/kubernetes/apps/coder/namespace.yaml
new file mode 100644
index 0000000..e580928
--- /dev/null
+++ b/kubernetes/apps/coder/namespace.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: coder
+  labels:
+    kustomize.toolkit.fluxcd.io/prune: disabled
+    volsync.backube/privileged-movers: "true"
+    pgo-enabled-hsn.dev: "true"
diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index a059e07..f0848de 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -8,7 +8,6 @@ resources:
   # Flux-Kustomizations
   - ./atuin/ks.yaml
   - ./autobrr/ks.yaml
-  - ./coder/ks.yaml
   - ./excalidraw/ks.yaml
   - ./it-tools/ks.yaml
   - ./maintainerr/ks.yaml