diff --git a/.taskfiles/Talos/Taskfile.yaml b/.taskfiles/Talos/Taskfile.yaml
index 07758c3a..aa9857d9 100644
--- a/.taskfiles/Talos/Taskfile.yaml
+++ b/.taskfiles/Talos/Taskfile.yaml
@@ -79,7 +79,7 @@ tasks:
     desc: Resets nodes back to maintenance mode
     prompt: This will destroy your cluster and reset the nodes back to maintenance mode... continue?
     dir: "{{.TALOS_DIR}}"
-    cmd: talhelper gencommand reset --extra-flags "--reboot {{- if eq .CLI_FORCE false }}--system-labels-to-wipe STATE --system-labels-to-wipe EPHEMERAL{{ end }} --graceful=false --wait=false" | bash
+    cmd: talhelper gencommand reset --extra-flags "--reboot {{- if eq .CLI_FORCE false }} --system-labels-to-wipe STATE --system-labels-to-wipe EPHEMERAL{{ end }} --graceful=false --wait=false" | bash
 
   .reset:
     internal: true
diff --git a/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2 b/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2
index 319e149f..de84f605 100644
--- a/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2
+++ b/bootstrap/templates/kubernetes/bootstrap/talos/helmfile.yaml.j2
@@ -22,22 +22,22 @@ releases:
     chart: cilium/cilium
     version: 1.15.5
     values: ["../../../apps/kube-system/cilium/app/helm-values.yaml"]
-    needs: ["prometheus-operator-crds"]
+    needs: ["observability/prometheus-operator-crds"]
   - name: coredns
     namespace: kube-system
     chart: coredns/coredns
     version: 1.29.0
     values: ["../../../apps/kube-system/coredns/app/helm-values.yaml"]
-    needs: ["prometheus-operator-crds", "cilium"]
+    needs: ["observability/prometheus-operator-crds", "cilium"]
   - name: kubelet-csr-approver
     namespace: kube-system
     chart: postfinance/kubelet-csr-approver
     version: 1.2.1
     values: ["../../../apps/kube-system/kubelet-csr-approver/app/helm-values.yaml"]
-    needs: ["prometheus-operator-crds", "cilium", "coredns"]
+    needs: ["observability/prometheus-operator-crds", "cilium", "coredns"]
   - name: spegel
     namespace: kube-system
     chart: oci://ghcr.io/spegel-org/helm-charts/spegel
     version: v0.0.22
     values: ["../../../apps/kube-system/spegel/app/helm-values.yaml"]
-    needs: ["prometheus-operator-crds", "cilium", "coredns", "kubelet-csr-approver"]
+    needs: ["observability/prometheus-operator-crds", "cilium", "coredns", "kubelet-csr-approver"]