diff --git a/inventory/host_vars/fas01.stg.phx2.fedoraproject.org b/inventory/host_vars/fas01.stg.phx2.fedoraproject.org
index 5e74c805cb..7114a4d92b 100644
--- a/inventory/host_vars/fas01.stg.phx2.fedoraproject.org
+++ b/inventory/host_vars/fas01.stg.phx2.fedoraproject.org
@@ -10,6 +10,7 @@ vmhost: virthost10.phx2.fedoraproject.org
 datacenter: phx2
 
 # There's only this server in stg, so it does certs.
-
 master_fas_node: True
 gen_cert: True
+
+collectd_graphite: True
diff --git a/roles/collectd/base/files/graphite.conf b/roles/collectd/base/files/graphite.conf
new file mode 100644
index 0000000000..d87aac9dbf
--- /dev/null
+++ b/roles/collectd/base/files/graphite.conf
@@ -0,0 +1,16 @@
+LoadPlugin "write_graphite"
+
+<Plugin "write_graphite">
+ <Node "laptop">
+   Host "graphite.cloud.fedoraproject.org"
+   Port "2003"
+   Prefix "collectd."
+   #Postfix ""
+   #Protocol "udp"
+   #LogSendErrors false
+   EscapeCharacter "_"
+   SeparateInstances true
+   StoreRates false
+   AlwaysAppendDS false
+ </Node>
+</Plugin>
diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml
index 217662717a..760b806d3d 100644
--- a/roles/collectd/base/tasks/main.yml
+++ b/roles/collectd/base/tasks/main.yml
@@ -56,6 +56,16 @@
   - restart collectd
   when: collectd_apache is defined
 
+- name: /etc/collectd/graphite.conf
+  copy: src=graphite.conf dest=/etc/collectd.d/graphite.conf
+  tags:
+  - collectd
+  - graphite
+  - graphite-collectd
+  notify:
+  - restart collectd
+  when: collectd_graphite is defined and ansible_distribution_major_version != '6'
+
 - name: Install libsemanage-python so we can set an sebool below
   yum: name=libsemanage-python state=present
   tags: