diff --git a/manifests/site.pp b/manifests/site.pp
index 56107c2d..8f984bec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,119 +1,120 @@
 node 'louvre.internal.softwareheritage.org' {
   include role::swh_server
 }
 
 node /^(orsay|beaubourg|hypervisor\d+)\.(internal\.)?softwareheritage\.org$/
 {
   include role::swh_hypervisor
 }
 
 node 'pergamon.softwareheritage.org' {
   include role::swh_sysadmin
+  include profile::export_archive_counters
 }
 
 node 'tate.softwareheritage.org' {
   include role::swh_forge
 }
 
 node 'moma.softwareheritage.org' {
   include role::swh_api
 }
 
 node 'webapp0.softwareheritage.org' {
   include role::swh_api_azure
 }
 
 node 'saatchi.internal.softwareheritage.org' {
   include role::swh_scheduler
 }
 
 node /^(belvedere|somerset).(internal.)?softwareheritage.org$/ {
   include role::swh_database
   include profile::pgbouncer
 }
 
 node 'banco.softwareheritage.org' {
   include role::swh_backup
   include role::postgresql_backup
 }
 
 node /^esnode\d+.(internal.)?softwareheritage.org$/ {
   include role::swh_elasticsearch
 }
 
 node /^(unibo-test).(internal.)?softwareheritage.org$/ {
   include role::swh_vault_test
 }
 
 node /^(unibo-prod|vangogh).(euwest.azure.)?(internal.)?softwareheritage.org$/ {
   include role::swh_vault
 }
 
 node /^uffizi\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_storage_baremetal
 }
 
 node /^storage\d+\.[^.]+\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_storage
 }
 
 node /^getty.(internal.)?softwareheritage.org$/ {
   include role::swh_eventlog
 }
 
 node /^worker\d+\.(internal\.)?softwareheritage\.org$/ {
   include role::swh_worker_inria
 }
 
 node /^worker\d+\..*\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_worker_azure
 }
 
 node /^dbreplica(0|1)\.euwest\.azure\.internal\.softwareheritage\.org$/ {
   include role::swh_database
 }
 
 node /^ceph-osd\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_osd
 }
 
 node /^ceph-mon\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ceph_mon
 }
 
 node /^ns\d+\.(.*\.azure\.)?internal\.softwareheritage\.org/ {
   include role::swh_nameserver_secondary
 }
 
 node 'thyssen.internal.softwareheritage.org' {
   include role::swh_ci_server
 }
 
 node /^jenkins-debian\d+\.internal\.softwareheritage\.org$/ {
   include role::swh_ci_agent_debian
 }
 
 node 'logstash0.internal.softwareheritage.org' {
   include role::swh_logstash_instance
 }
 
 node 'kibana0.internal.softwareheritage.org' {
   include role::swh_kibana_instance
 }
 
 node 'munin0.internal.softwareheritage.org' {
   include role::swh_munin_master
 }
 
 node
   'giverny.softwareheritage.org',
   'petit-palais.softwareheritage.org',
   'grand-palais.softwareheritage.org',
   'ddouard-desktop.internal.softwareheritage.org' {
   include role::swh_desktop
 }
 
 node default {
   include role::swh_base
   include profile::puppet::agent
 }
diff --git a/site-modules/profile/manifests/export_archive_counters.pp b/site-modules/profile/manifests/export_archive_counters.pp
index fede0385..1322e3a2 100644
--- a/site-modules/profile/manifests/export_archive_counters.pp
+++ b/site-modules/profile/manifests/export_archive_counters.pp
@@ -1,42 +1,39 @@
 # stats_export master class
-class profile::munin::stats_export {
+class profile::export_archive_counters {
   $export_path = lookup('stats_export::export_path')
   $export_file = lookup('stats_export::export_file')
 
   $packages = ['python3-click']
 
   package {$packages:
     ensure => present,
   }
 
   file {'/usr/local/bin/export-archive_counters.py':
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0755',
     source  => 'puppet:///modules/profile/stats_exporter/export-archive_counters.py',
     require => Package[$packages],
   }
 
-  file {'/usr/local/share/swh-date/history-counters.munin.json':
+  file {'/usr/local/share/swh-data/history-counters.munin.json':
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
     source  => 'puppet:///modules/profile/stats_exporter/history-counters.munin.json',
   }
 
   cron {'stats_export':
     ensure   => present,
     user     => 'www-data',
     command  => "/usr/local/bin/export-rrd > ${export_file}.tmp && /bin/mv ${export_file}.tmp ${export_file}",
     hour     => fqdn_rand(24, 'stats_export_hour'),
     minute   => fqdn_rand(60, 'stats_export_minute'),
     month    => '*',
     monthday => '*',
     weekday  => '*',
-    require  => [
-      File['/usr/local/bin/export-rrd'],
-    ],
   }
 }
diff --git a/site-modules/role/manifests/swh_munin_master.pp b/site-modules/role/manifests/swh_munin_master.pp
index 27caf14a..cf9f33f5 100644
--- a/site-modules/role/manifests/swh_munin_master.pp
+++ b/site-modules/role/manifests/swh_munin_master.pp
@@ -1,5 +1,4 @@
 class role::swh_munin_master inherits role::swh_server {
   include profile::puppet::agent
   include profile::munin::master
-  include profile::munin::stats_export
 }