diff --git a/applications/base/genestack-sources/genestack.yaml b/applications/base/genestack-sources/genestack.yaml
deleted file mode 100644
index c972e14..0000000
--- a/applications/base/genestack-sources/genestack.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: genestack-repo
-  namespace: flux-system
-spec:
-  interval: 1m
-  url: https://github.com/rackerlabs/genestack.git
-  ref:
-    tag: release-2025.2.6
diff --git a/applications/base/genestack-sources/gitrepository-aggregator.yaml b/applications/base/genestack-sources/gitrepository-aggregator.yaml
deleted file mode 100644
index e7d4fbf..0000000
--- a/applications/base/genestack-sources/gitrepository-aggregator.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: genestack-root
-  namespace: flux-system
-spec:
-  url: ssh://git@github.com/pratik705/openCenter-poc
-  ref:
-    branch: main
-  interval: 1m
-  secretRef:
-    name: flux-system
-  include:
-    - repository:
-        name: genestack-repo
-      fromPath: /
-      toPath: applications/base/genestack
diff --git a/applications/base/genestack-sources/kustomization.yaml b/applications/base/genestack-sources/kustomization.yaml
deleted file mode 100644
index f48e75f..0000000
--- a/applications/base/genestack-sources/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: flux-system
-resources:
-  - ./gitrepository-aggregator.yaml
-  - ./genestack.yaml
-  - ./openstack-helm.yaml
diff --git a/applications/base/genestack-sources/openstack-helm.yaml b/applications/base/genestack-sources/openstack-helm.yaml
deleted file mode 100644
index 6f3e2b3..0000000
--- a/applications/base/genestack-sources/openstack-helm.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: openstack-helm
-  namespace: flux-system
-spec:
-  url: https://tarballs.opendev.org/openstack/openstack-helm
-  interval: 1h
diff --git a/applications/base/managed-services/alert-proxy/helm-values/hardened-values-v0.0.1.yaml b/applications/base/managed-services/alert-proxy/helm-values/hardened-values-v0.0.1.yaml
index 860685f..6dc5817 100644
--- a/applications/base/managed-services/alert-proxy/helm-values/hardened-values-v0.0.1.yaml
+++ b/applications/base/managed-services/alert-proxy/helm-values/hardened-values-v0.0.1.yaml
@@ -1,5 +1,5 @@
 ---
-namespace: rackspace-system
+namespace: rackspace
 
 replicaCount: 1
 
diff --git a/applications/base/managed-services/alert-proxy/helmrelease.yaml b/applications/base/managed-services/alert-proxy/helmrelease.yaml
index 3cac450..afa3ec4 100644
--- a/applications/base/managed-services/alert-proxy/helmrelease.yaml
+++ b/applications/base/managed-services/alert-proxy/helmrelease.yaml
@@ -3,7 +3,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: alert-proxy
-  namespace: rackspace-system
+  namespace: rackspace
 spec:
   interval: 5m
   timeout: 10m
@@ -15,9 +15,9 @@ spec:
       remediateLastFailure: true
   upgrade:
     remediation:
-      retries: 3
-      remediateLastFailure: true
-  targetNamespace: rackspace-system
+      retries: 0
+      remediateLastFailure: false
+  targetNamespace: rackspace
   chart:
     spec:
       chart: ./helm
diff --git a/applications/base/managed-services/alert-proxy/kustomization.yaml b/applications/base/managed-services/alert-proxy/kustomization.yaml
index 75645c1..e183b94 100644
--- a/applications/base/managed-services/alert-proxy/kustomization.yaml
+++ b/applications/base/managed-services/alert-proxy/kustomization.yaml
@@ -1,11 +1,15 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: alert-proxy-values-base
-    namespace: rackspace-system
+    namespace: rackspace
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-v0.0.1.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-v0.0.1.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/managed-services/alert-proxy/namespace.yaml b/applications/base/managed-services/alert-proxy/namespace.yaml
index 352474b..eb9b6d6 100644
--- a/applications/base/managed-services/alert-proxy/namespace.yaml
+++ b/applications/base/managed-services/alert-proxy/namespace.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: rackspace-system
+  name: rackspace
diff --git a/applications/base/services/cert-manager/kustomization.yaml b/applications/base/services/cert-manager/kustomization.yaml
index 789982b..85f3834 100644
--- a/applications/base/services/cert-manager/kustomization.yaml
+++ b/applications/base/services/cert-manager/kustomization.yaml
@@ -1,11 +1,14 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
-
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: cert-manager-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-v1.18.2.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-v1.18.2.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/external-snapshotter/kustomization.yaml b/applications/base/services/external-snapshotter/kustomization.yaml
index ba59ad6..bd092ae 100644
--- a/applications/base/services/external-snapshotter/kustomization.yaml
+++ b/applications/base/services/external-snapshotter/kustomization.yaml
@@ -3,8 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: external-snapshotter
 resources:
-  [
-    "./namespace.yaml",
-    "github.com/kubernetes-csi/external-snapshotter//client/config/crd?ref=v8.2.1",
-    "github.com/kubernetes-csi/external-snapshotter//deploy/kubernetes/snapshot-controller?ref=v8.2.1",
-  ]
+  - "namespace.yaml"
+  - "github.com/kubernetes-csi/external-snapshotter//client/config/crd?ref=v8.2.1"
+  - "github.com/kubernetes-csi/external-snapshotter//deploy/kubernetes/snapshot-controller?ref=v8.2.1"
diff --git a/applications/base/services/gateway-api/kustomization.yaml b/applications/base/services/gateway-api/kustomization.yaml
index bb31e86..da8ed5f 100644
--- a/applications/base/services/gateway-api/kustomization.yaml
+++ b/applications/base/services/gateway-api/kustomization.yaml
@@ -1,12 +1,15 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
-
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: envoy-gateway-api-values-base
     namespace: envoy-gateway-system
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-v0.0.0.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-v0.0.0.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/harbor/kustomization.yaml b/applications/base/services/harbor/kustomization.yaml
index 0584c07..bc07fc8 100644
--- a/applications/base/services/harbor/kustomization.yaml
+++ b/applications/base/services/harbor/kustomization.yaml
@@ -1,11 +1,14 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
-
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: harbor-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-1.17.2.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-1.17.2.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/headlamp/kustomization.yaml b/applications/base/services/headlamp/kustomization.yaml
index 2926356..81db911 100644
--- a/applications/base/services/headlamp/kustomization.yaml
+++ b/applications/base/services/headlamp/kustomization.yaml
@@ -1,11 +1,15 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 
 secretGenerator:
   - name: headlamp-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-0.35.0.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-0.35.0.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/ingress-nginx/kustomization.yaml b/applications/base/services/ingress-nginx/kustomization.yaml
index 7620c2b..e53978a 100644
--- a/applications/base/services/ingress-nginx/kustomization.yaml
+++ b/applications/base/services/ingress-nginx/kustomization.yaml
@@ -2,10 +2,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: ingress-nginx
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "/source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: ingress-nginx-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-4.13.0.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-4.13.0.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/keycloak/00-postgres/kustomization.yaml b/applications/base/services/keycloak/00-postgres/kustomization.yaml
index b5da85e..40aee6f 100644
--- a/applications/base/services/keycloak/00-postgres/kustomization.yaml
+++ b/applications/base/services/keycloak/00-postgres/kustomization.yaml
@@ -2,4 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: keycloak
-resources: ["./namespace.yaml", "./postgres-cluster.yaml"]
+resources:
+  - "namespace.yaml"
+  - "postgres-cluster.yaml"
diff --git a/applications/base/services/keycloak/10-operator/kustomization.yaml b/applications/base/services/keycloak/10-operator/kustomization.yaml
index 0bc3327..142c379 100644
--- a/applications/base/services/keycloak/10-operator/kustomization.yaml
+++ b/applications/base/services/keycloak/10-operator/kustomization.yaml
@@ -2,4 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: keycloak
-resources: ["./operatorgroup.yaml", "./subscription.yaml"]
+resources:
+  - "operatorgroup.yaml"
+  - "subscription.yaml"
diff --git a/applications/base/services/keycloak/20-keycloak/kustomization.yaml b/applications/base/services/keycloak/20-keycloak/kustomization.yaml
index 7bf515d..67b316c 100644
--- a/applications/base/services/keycloak/20-keycloak/kustomization.yaml
+++ b/applications/base/services/keycloak/20-keycloak/kustomization.yaml
@@ -3,5 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: keycloak
 resources:
-  - "./keycloak-cr.yaml"
-  - "./rbac/"
+  - "keycloak-cr.yaml"
+  - "rbac/"
diff --git a/applications/base/services/keycloak/20-keycloak/rbac/kustomization.yaml b/applications/base/services/keycloak/20-keycloak/rbac/kustomization.yaml
index 7787702..c91361c 100644
--- a/applications/base/services/keycloak/20-keycloak/rbac/kustomization.yaml
+++ b/applications/base/services/keycloak/20-keycloak/rbac/kustomization.yaml
@@ -2,4 +2,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - "./k8s-ops-cluster-role.yaml"
+  - "k8s-ops-cluster-role.yaml"
diff --git a/applications/base/services/kube-prometheus-stack/kustomization.yaml b/applications/base/services/kube-prometheus-stack/kustomization.yaml
index fb16b7c..d36fe64 100644
--- a/applications/base/services/kube-prometheus-stack/kustomization.yaml
+++ b/applications/base/services/kube-prometheus-stack/kustomization.yaml
@@ -1,14 +1,17 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: kube-prometheus-stack-values-base
     namespace: observability
     type: Opaque
     files:
-      - hardened.yaml=helm-values/hardened-values-v0.0.1.yaml
-      - alertmanager-overrides.yaml=helm-values/alertmanager-overrides.yaml
-      - prometheus-overrides.yaml=helm-values/prometheus-overrides.yaml
+      - hardened.yaml="helm-values/hardened-values-v0.0.1.yaml"
+      - alertmanager-overrides.yaml="helm-values/alertmanager-overrides.yaml"
+      - prometheus-overrides.yaml="helm-values/prometheus-overrides.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/metallb/kustomization.yaml b/applications/base/services/metallb/kustomization.yaml
index 50a40db..7f1b8fb 100644
--- a/applications/base/services/metallb/kustomization.yaml
+++ b/applications/base/services/metallb/kustomization.yaml
@@ -2,10 +2,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: metallb-system
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: metallb-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-0.15.2.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-0.15.2.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/olm/kustomization.yaml b/applications/base/services/olm/kustomization.yaml
index dd5f03c..ae9bd55 100644
--- a/applications/base/services/olm/kustomization.yaml
+++ b/applications/base/services/olm/kustomization.yaml
@@ -2,5 +2,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.34.0/crds.yaml
-  - https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.34.0/olm.yaml
+  - "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.34.0/crds.yaml"
+  - "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.34.0/olm.yaml"
diff --git a/applications/base/services/openstack-ccm/kustomization.yaml b/applications/base/services/openstack-ccm/kustomization.yaml
index dc0e6a1..d7f554b 100644
--- a/applications/base/services/openstack-ccm/kustomization.yaml
+++ b/applications/base/services/openstack-ccm/kustomization.yaml
@@ -2,10 +2,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: openstack-ccm
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: openstack-ccm-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-2.33.1.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-2.33.1.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/openstack-csi/kustomization.yaml b/applications/base/services/openstack-csi/kustomization.yaml
index f0c1676..12769f7 100644
--- a/applications/base/services/openstack-csi/kustomization.yaml
+++ b/applications/base/services/openstack-csi/kustomization.yaml
@@ -2,10 +2,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: openstack-csi
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: openstack-csi-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-2.33.1.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-2.33.1.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/postgres-operator/kustomization.yaml b/applications/base/services/postgres-operator/kustomization.yaml
index ffcdc52..c9b4e99 100644
--- a/applications/base/services/postgres-operator/kustomization.yaml
+++ b/applications/base/services/postgres-operator/kustomization.yaml
@@ -2,10 +2,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: postgres-operator
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: postgres-operator-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-1.14.0.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-1.14.0.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/sealed-secrets/kustomization.yaml b/applications/base/services/sealed-secrets/kustomization.yaml
index d3fb81c..a14baba 100644
--- a/applications/base/services/sealed-secrets/kustomization.yaml
+++ b/applications/base/services/sealed-secrets/kustomization.yaml
@@ -1,9 +1,13 @@
 ---
 namespace: sealed-secrets
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: sealed-secrets-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-2.17.3.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-2.17.3.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/velero/kustomization.yaml b/applications/base/services/velero/kustomization.yaml
index c15ea6f..16aebe3 100644
--- a/applications/base/services/velero/kustomization.yaml
+++ b/applications/base/services/velero/kustomization.yaml
@@ -1,9 +1,13 @@
 ---
 namespace: velero
-resources: [./namespace.yaml, ./source.yaml, ./helmrelease.yaml]
+resources:
+  - "namespace.yaml"
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: velero-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-10.1.1.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-10.1.1.yaml"
     options:
       disableNameSuffixHash: true
diff --git a/applications/base/services/weave-gitops/kustomization.yaml b/applications/base/services/weave-gitops/kustomization.yaml
index 9908d72..ec63a2f 100644
--- a/applications/base/services/weave-gitops/kustomization.yaml
+++ b/applications/base/services/weave-gitops/kustomization.yaml
@@ -1,9 +1,12 @@
 ---
 namespace: flux-system
-resources: [./source.yaml, ./helmrelease.yaml]
+resources:
+  - "source.yaml"
+  - "helmrelease.yaml"
 secretGenerator:
   - name: weave-gitops-values-base
     type: Opaque
-    files: [hardened.yaml=helm-values/hardened-values-4.0.36.yaml]
+    files:
+      - hardened.yaml="helm-values/hardened-values-4.0.36.yaml"
     options:
       disableNameSuffixHash: true