diff --git a/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator.yaml b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator.yaml
new file mode 100644
index 0000000..719ef6e
--- /dev/null
+++ b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator.yaml
@@ -0,0 +1,26 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: grafana-operator
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
+  destination:
+    name: in-cluster
+    namespace: observability
+  sources:
+    - chart: grafana-operator
+      repoURL: oci://ghcr.io/grafana/helm-charts
+      targetRevision: v5.18.0
+      releaseName: grafana-operator
+    - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances
+      targetRevision: HEAD
+      path: "otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests"
diff --git a/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/grafana.yaml b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/grafana.yaml
new file mode 100644
index 0000000..53a10e1
--- /dev/null
+++ b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/grafana.yaml
@@ -0,0 +1,17 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: Grafana
+metadata:
+  name: grafana
+  labels:
+    dashboards: "grafana"
+spec:
+  persistentVolumeClaim:
+    spec:
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: 10Gi
+  plugins:
+    - victoriametrics-metrics-datasource
+    - victoriametrics-logs-datasource
diff --git a/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml
new file mode 100644
index 0000000..8eb50f2
--- /dev/null
+++ b/otc/observability.think-ahead.cloud/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml
@@ -0,0 +1,6 @@
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: ingress-nginx 
+spec:
+  url: "https://grafana.com/api/dashboards/1860/revisions/30/download"
diff --git a/otc/observability.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml b/otc/observability.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml
index d599a5d..2459768 100644
--- a/otc/observability.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml
+++ b/otc/observability.think-ahead.cloud/stacks/observability/victoria-k8s-stack/values.yaml
@@ -50,7 +50,7 @@ defaultDashboards:
   annotations: {}
   grafanaOperator:
     # -- Create dashboards as CRDs (requires grafana-operator to be installed)
-    enabled: false
+    enabled: true
     spec:
       instanceSelector:
         matchLabels:
@@ -826,7 +826,7 @@ vmagent:
 defaultDatasources:
   grafanaOperator:
     # -- Create datasources as CRDs (requires grafana-operator to be installed)
-    enabled: false
+    enabled: true
     annotations: {}
     spec:
       instanceSelector:
@@ -869,7 +869,7 @@ defaultDatasources:
 
 # -- Grafana dependency chart configuration. For possible values refer [here](https://github.com/grafana/helm-charts/tree/main/charts/grafana#configuration)
 grafana:
-  enabled: true
+  enabled: false
   # all values for grafana helm chart can be specified here
   persistence:
     enabled: true
@@ -903,8 +903,6 @@ grafana:
         url: "https://grafana.com/api/dashboards/22759/revisions/6/download"
       ingress-nginx:
         url: "https://raw.githubusercontent.com/adinhodovic/ingress-nginx-mixin/refs/heads/main/dashboards_out/ingress-nginx-overview.json"
-      node-exporter-full:
-        url: "https://raw.githubusercontent.com/rfmoz/grafana-dashboards/refs/heads/master/prometheus/node-exporter-full.json"
       argocd:
         url: "https://raw.githubusercontent.com/argoproj/argo-cd/refs/heads/master/examples/dashboard.json"