diff --git a/modules.env b/modules.env
index c1a472ebb6..1de88cdd90 100644
--- a/modules.env
+++ b/modules.env
@@ -39,10 +39,6 @@ OPENSTACK_GIT_ROOT=https://git.openstack.org
 
 SOURCE_MODULES["https://git.drupal.org/project/puppet-drush"]="origin/1.0.x"
 SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8"
-# 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"]="v2.1.0"
 SOURCE_MODULES["https://github.com/biemond/biemond-wildfly"]="v1.2.4"
 SOURCE_MODULES["https://github.com/dalen/puppet-dnsquery"]="2.0.1"
 SOURCE_MODULES["https://github.com/deric/puppet-zookeeper"]="v0.5.5"
@@ -75,6 +71,10 @@ SOURCE_MODULES["https://github.com/vamsee/puppet-solr"]="0.0.8"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-alternatives"]="0.3.0"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-archive"]="v0.5.1"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-git_resource"]="0.3.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/voxpupuli/puppet-grafana"]="v2.6.1"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"