diff --git a/modules.env b/modules.env
index 13731def44..e19880c3d5 100644
--- a/modules.env
+++ b/modules.env
@@ -38,7 +38,7 @@ SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.
 # NOTE(yolanda): please note that grafana depends on camptocamp-archive. This is a
 # potential conflict with puppet-community/puppet-archive. So we cannot
 # rely on using any feature on grafana that relies on archive
-SOURCE_MODULES["https://github.com/bfraser/puppet-grafana"]="c51f03df3b41755bf3968c978d80b3fc94138652"
+SOURCE_MODULES["https://github.com/bfraser/puppet-grafana"]="v2.1.0"
 SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v0.2.4"
 SOURCE_MODULES["https://github.com/maestrodev/puppet-wget"]="v1.6.0"
 SOURCE_MODULES["https://github.com/nanliu/puppet-git"]="0.1.0"
diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index 3d8e5003ee..5e5dc40692 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -51,7 +51,9 @@ class openstack_project::grafana (
   $grafana_cfg_merged = merge($grafana_cfg_defaults, $grafana_cfg)
 
   class { '::grafana':
-    cfg => $grafana_cfg_merged,
+    cfg            => $grafana_cfg_merged,
+    install_method => 'repo',
+    version        => '2.1.0',
   }
 
   ::httpd::vhost { $vhost_name: