diff --git a/.gitignore b/.gitignore
index d10b826..6cd6752 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,7 +100,6 @@ fabric.properties
 /argocd/eu-central-1/charts/
 /argo-rollouts/base/charts/
 /kargo/base/charts/
-/victoria-metrics/eu-central-1/charts/
 /kargo/base/kargo-admin-password.yaml
 /cert.pem
 ### Sealed Secrets ###
diff --git a/eu-central-1/argo-apps/victoria-metrics/victoria-logs.yaml b/eu-central-1/argo-apps/victoria-metrics/victoria-logs.yaml
new file mode 100644
index 0000000..2043ebc
--- /dev/null
+++ b/eu-central-1/argo-apps/victoria-metrics/victoria-logs.yaml
@@ -0,0 +1,28 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: victoria-logs
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  project: default
+  destination:
+    namespace: victoria-metrics
+    server: https://kubernetes.default.svc
+  sources:
+    - repoURL: https://victoriametrics.github.io/helm-charts/
+      chart: victoria-logs-single
+      targetRevision: 0.12.4
+      helm:
+        valueFiles:
+          - $values/victoria-metrics/eu-central-1/victoria-logs-values.yaml
+    - repoURL: git@git.janis-eccarius.de:NowChess/GitOps.git
+      targetRevision: main
+      ref: values
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-crds.yaml b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-crds.yaml
new file mode 100644
index 0000000..1e9d133
--- /dev/null
+++ b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-crds.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: victoria-metrics-crds
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "-2"
+spec:
+  project: default
+  destination:
+    namespace: victoria-metrics
+    server: https://kubernetes.default.svc
+  sources:
+    - repoURL: https://victoriametrics.github.io/helm-charts/
+      chart: victoria-metrics-operator-crds
+      targetRevision: 0.9.0
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - Replace=true
+    retry:
+      limit: 3
+      backoff:
+        duration: 10s
+        factor: 2
+        maxDuration: 1m
diff --git a/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-operator.yaml b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-operator.yaml
index 5854c2c..a47351e 100644
--- a/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-operator.yaml
+++ b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics-operator.yaml
@@ -11,9 +11,15 @@ spec:
     namespace: victoria-metrics
     server: https://kubernetes.default.svc
   sources:
+    - repoURL: https://victoriametrics.github.io/helm-charts/
+      chart: victoria-metrics-operator
+      targetRevision: 0.62.1
+      helm:
+        valueFiles:
+          - $values/victoria-metrics-operator/eu-central-1/values.yaml
     - repoURL: git@git.janis-eccarius.de:NowChess/GitOps.git
-      path: ./victoria-metrics-operator/eu-central-1
       targetRevision: main
+      ref: values
   syncPolicy:
     automated:
       prune: true
@@ -21,3 +27,9 @@ spec:
     syncOptions:
       - CreateNamespace=true
       - ServerSideApply=true
+    retry:
+      limit: 3
+      backoff:
+        duration: 10s
+        factor: 2
+        maxDuration: 1m
diff --git a/eu-central-1/argo-apps/victoria-metrics/victoria-metrics.yaml b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics.yaml
index b906c71..4a43323 100644
--- a/eu-central-1/argo-apps/victoria-metrics/victoria-metrics.yaml
+++ b/eu-central-1/argo-apps/victoria-metrics/victoria-metrics.yaml
@@ -3,15 +3,23 @@ kind: Application
 metadata:
   name: victoria-metrics
   namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
 spec:
   project: default
   destination:
     namespace: victoria-metrics
     server: https://kubernetes.default.svc
   sources:
+    - repoURL: https://victoriametrics.github.io/helm-charts/
+      chart: victoria-metrics-k8s-stack
+      targetRevision: 0.76.0
+      helm:
+        valueFiles:
+          - $values/victoria-metrics/eu-central-1/vm-stack-values.yaml
     - repoURL: git@git.janis-eccarius.de:NowChess/GitOps.git
-      path: ./victoria-metrics/eu-central-1
       targetRevision: main
+      ref: values
   syncPolicy:
     automated:
       prune: true
@@ -20,3 +28,9 @@ spec:
       - CreateNamespace=true
       - ServerSideApply=true
       - SkipDryRunOnMissingResource=true
+    retry:
+      limit: 5
+      backoff:
+        duration: 30s
+        factor: 2
+        maxDuration: 5m
diff --git a/eu-central-1/argo-apps/victoria-metrics/victoria-traces.yaml b/eu-central-1/argo-apps/victoria-metrics/victoria-traces.yaml
new file mode 100644
index 0000000..b0fcb0a
--- /dev/null
+++ b/eu-central-1/argo-apps/victoria-metrics/victoria-traces.yaml
@@ -0,0 +1,28 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: victoria-traces
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "0"
+spec:
+  project: default
+  destination:
+    namespace: victoria-metrics
+    server: https://kubernetes.default.svc
+  sources:
+    - repoURL: https://victoriametrics.github.io/helm-charts/
+      chart: victoria-traces-single
+      targetRevision: 0.0.7
+      helm:
+        valueFiles:
+          - $values/victoria-metrics/eu-central-1/victoria-traces-values.yaml
+    - repoURL: git@git.janis-eccarius.de:NowChess/GitOps.git
+      targetRevision: main
+      ref: values
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/victoria-metrics-operator/eu-central-1/kustomization.yaml b/victoria-metrics-operator/eu-central-1/kustomization.yaml
deleted file mode 100644
index 7a7fc74..0000000
--- a/victoria-metrics-operator/eu-central-1/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-helmCharts:
-  - name: victoria-metrics-operator
-    repo: https://victoriametrics.github.io/helm-charts/
-    version: 0.62.1
-    releaseName: victoria-metrics-operator
-    namespace: victoria-metrics
-    valuesFile: values.yaml
diff --git a/victoria-metrics/eu-central-1/kustomization.yaml b/victoria-metrics/eu-central-1/kustomization.yaml
deleted file mode 100644
index e88afcb..0000000
--- a/victoria-metrics/eu-central-1/kustomization.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - namespace.yaml
-helmCharts:
-  - name: victoria-metrics-k8s-stack
-    repo: https://victoriametrics.github.io/helm-charts/
-    version: 0.76.0
-    releaseName: vm-stack
-    namespace: victoria-metrics
-    valuesFile: vm-stack-values.yaml
-  - name: victoria-logs-single
-    repo: https://victoriametrics.github.io/helm-charts/
-    version: 0.12.4
-    releaseName: victoria-logs
-    namespace: victoria-metrics
-    valuesFile: victoria-logs-values.yaml
-  - name: victoria-traces-single
-    repo: https://victoriametrics.github.io/helm-charts/
-    version: 0.0.7
-    releaseName: victoria-traces
-    namespace: victoria-metrics
-    valuesFile: victoria-traces-values.yaml
diff --git a/victoria-metrics/eu-central-1/namespace.yaml b/victoria-metrics/eu-central-1/namespace.yaml
deleted file mode 100644
index d8d0b8b..0000000
--- a/victoria-metrics/eu-central-1/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: victoria-metrics