diff --git a/k8s-manifests/monitoring/prometheus/grafana-ressources/nginx-dashboard.yml b/k8s-manifests/monitoring/grafana-ressources/nginx-dashboard.yml
similarity index 100%
rename from k8s-manifests/monitoring/prometheus/grafana-ressources/nginx-dashboard.yml
rename to k8s-manifests/monitoring/grafana-ressources/nginx-dashboard.yml
diff --git a/k8s-manifests/monitoring/prometheus/prometheus-stack.jsonnet b/k8s-manifests/monitoring/prometheus-stack.jsonnet
similarity index 72%
rename from k8s-manifests/monitoring/prometheus/prometheus-stack.jsonnet
rename to k8s-manifests/monitoring/prometheus-stack.jsonnet
index 9118eba..2fd8780 100644
--- a/k8s-manifests/monitoring/prometheus/prometheus-stack.jsonnet
+++ b/k8s-manifests/monitoring/prometheus-stack.jsonnet
@@ -1,8 +1,21 @@
 # vim:expandtab:
-local helmapp = import "../../../_templates/argo_helm_app.template";
-local vars = import "prometheus_vars";
+local helmapp = import "../../_templates/argo_helm_app.template";
+local argoapp = import "../../_templates/argo_app.template";
+
+local vars = {
+	"version": "34.9.0",
+	"namespace": "metrics"
+};
 
 [
+argoapp + {
+  name:: "prometheus-crds",
+  namespace:: vars.namespace,
+  repo:: "https://github.com/prometheus-community/helm-charts.git",
+  path:: "charts/kube-prometheus-stack/crds/",
+  version:: "kube-prometheus-stack-" + vars.version,
+  syncOptions:: ["CreateNamespace=true", "Replace=true"]
+},
 helmapp + {
   name:: "prometheus-grafana",
   namespace: vars.namespace,
diff --git a/k8s-manifests/monitoring/prometheus/prometheus-stack-crds.jsonnet b/k8s-manifests/monitoring/prometheus/prometheus-stack-crds.jsonnet
deleted file mode 100644
index 43ed411..0000000
--- a/k8s-manifests/monitoring/prometheus/prometheus-stack-crds.jsonnet
+++ /dev/null
@@ -1,14 +0,0 @@
-# vim:expandtab:
-local argoapp = import "../../../_templates/argo_app.template";
-local vars = import "prometheus_vars";
-
-[
-argoapp + {
-  name:: "prometheus-crds",
-  namespace:: vars.namespace,
-  repo:: "https://github.com/prometheus-community/helm-charts.git",
-  path:: "charts/kube-prometheus-stack/crds/",
-  version:: "kube-prometheus-stack-" + vars.version,
-  syncOptions:: ["CreateNamespace=true", "Replace=true"]
-}
-]
diff --git a/k8s-manifests/monitoring/prometheus/prometheus_vars b/k8s-manifests/monitoring/prometheus/prometheus_vars
deleted file mode 100644
index 0c8047a..0000000
--- a/k8s-manifests/monitoring/prometheus/prometheus_vars
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"version": "34.9.0",
-	"namespace": "metrics"
-}