diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml
index 760b806d3d..4e4a735c1c 100644
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@@ -57,7 +57,7 @@
   when: collectd_apache is defined
 
 - name: /etc/collectd/graphite.conf
-  copy: src=graphite.conf dest=/etc/collectd.d/graphite.conf
+  template: src=graphite.conf dest=/etc/collectd.d/graphite.conf
   tags:
   - collectd
   - graphite
diff --git a/roles/collectd/base/files/graphite.conf b/roles/collectd/base/templates/graphite.conf
similarity index 88%
rename from roles/collectd/base/files/graphite.conf
rename to roles/collectd/base/templates/graphite.conf
index d87aac9dbf..e72d1135d0 100644
--- a/roles/collectd/base/files/graphite.conf
+++ b/roles/collectd/base/templates/graphite.conf
@@ -4,7 +4,7 @@ LoadPlugin "write_graphite"
  <Node "laptop">
    Host "graphite.cloud.fedoraproject.org"
    Port "2003"
-   Prefix "collectd."
+   Prefix "collectd.{{ environment }}"
    #Postfix ""
    #Protocol "udp"
    #LogSendErrors false