diff --git a/manifests/site.pp b/manifests/site.pp
index 80196785a1..f6f83fdf40 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -101,6 +101,7 @@ node /^review-dev\d*\.open.*\.org$/ {
 }
 
 # Node-OS: xenial
+# Puppet-Version: !3
 node /^grafana\d*\.open.*\.org$/ {
   $group = "grafana"
   class { 'openstack_project::server': }
diff --git a/modules.env b/modules.env
index a1ff9c0c37..d588876108 100644
--- a/modules.env
+++ b/modules.env
@@ -58,10 +58,7 @@ 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-grafana"]="v6.0.0"
 SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"