diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 58e5d2c0aa..e9c9000d53 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -685,7 +685,7 @@ dummy:
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: octopus
 #grafana_dashboard_files:
 #  - ceph-cluster.json
 #  - cephfs-overview.json
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index b74dacd056..06ef04731f 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -685,7 +685,7 @@ grafana_container_image: registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8:4
 #grafana_uid: 472
 #grafana_datasource: Dashboard
 #grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-#grafana_dashboard_version: master
+#grafana_dashboard_version: octopus
 #grafana_dashboard_files:
 #  - ceph-cluster.json
 #  - cephfs-overview.json
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index dc76ea7670..c38bb9c80b 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -677,7 +677,7 @@ grafana_container_memory: 4
 grafana_uid: 472
 grafana_datasource: Dashboard
 grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-grafana_dashboard_version: master
+grafana_dashboard_version: octopus
 grafana_dashboard_files:
   - ceph-cluster.json
   - cephfs-overview.json