diff --git a/applicationsets/grafana-appset.yaml b/applicationsets/grafana-appset.yaml
new file mode 100644
index 0000000..69a1c23
--- /dev/null
+++ b/applicationsets/grafana-appset.yaml
@@ -0,0 +1,38 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: grafana-appset
+  namespace: argocd
+spec:
+  generators:
+    - list:
+        elements:
+          - env: prod
+            valuesFile: values-prod.yaml
+            nameSuffix: grafana-prod
+            host: grafana.dvirlabs.com
+          - env: int
+            valuesFile: values-int.yaml
+            nameSuffix: grafana-int
+            host: grafana-int.dvirlabs.com
+  template:
+    metadata:
+      name: '{{nameSuffix}}'
+    spec:
+      project: observability
+      source:
+        repoURL: https://git.dvirlabs.com/dvirlabs/observability-stack.git
+        targetRevision: main
+        path: charts/grafana
+        helm:
+          valueFiles:
+            - ../../manifest/grafana/{{valuesFile}}
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: monitoring
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
\ No newline at end of file
diff --git a/applicationsets/prometheus-appset.yaml b/applicationsets/prometheus-appset.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/argocd-apps/grafana/grafana-int.yaml b/old/argocd-apps/grafana/grafana-int.yaml
similarity index 100%
rename from argocd-apps/grafana/grafana-int.yaml
rename to old/argocd-apps/grafana/grafana-int.yaml
diff --git a/argocd-apps/grafana/grafana-prod.yaml b/old/argocd-apps/grafana/grafana-prod.yaml
similarity index 100%
rename from argocd-apps/grafana/grafana-prod.yaml
rename to old/argocd-apps/grafana/grafana-prod.yaml
diff --git a/argocd-apps/prometheus/prometheus.yaml b/old/argocd-apps/prometheus/prometheus.yaml
similarity index 100%
rename from argocd-apps/prometheus/prometheus.yaml
rename to old/argocd-apps/prometheus/prometheus.yaml