diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml
index 1f6ed74..77ede9d 100644
--- a/roles/influxdb/tasks/main.yml
+++ b/roles/influxdb/tasks/main.yml
@@ -3,21 +3,14 @@
 ---
 - name: Install and configure Influxdb
   block:
-    - name: Install influxdb
-      block:
-        - name: Install package
-          apt:
-            name:
-              - influxdb
-              - influxdb-client
-        - name: Template out config
-          template:
-            src: "influxdb.conf"
-            dest: "/etc/influxdb/influxdb.conf"
-          notify: restart influxdb
-    - name: Install telegraf
-      block:
-        - name: Install package
-          apt:
-            deb: "https://dl.influxdata.com/telegraf/releases/telegraf_1.14.2-1_amd64.deb"
+    - name: Install package
+      apt:
+        name:
+          - influxdb
+          - influxdb-client
+    - name: Template out config
+      template:
+        src: "influxdb.conf"
+        dest: "/etc/influxdb/influxdb.conf"
+      notify: restart influxdb
   become: yes
diff --git a/roles/telegraf/handlers/main.yml b/roles/telegraf/handlers/main.yml
new file mode 100644
index 0000000..4d0a738
--- /dev/null
+++ b/roles/telegraf/handlers/main.yml
@@ -0,0 +1,8 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+---
+- name: restart telegraf
+  systemd:
+    name: telegraf
+    state: restarted
+  become: yes
diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml
new file mode 100644
index 0000000..eff3346
--- /dev/null
+++ b/roles/telegraf/tasks/main.yml
@@ -0,0 +1,20 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+---
+- name: Install and configure Telegraf
+  block:
+    - name: Add repo keys by URL
+      apt_key:
+        url: "{{ item }}"
+      loop:
+        - "https://repos.influxdata.com/influxdb.key"
+    - name: Add repos
+      apt_repository:
+        repo: "{{ item }}"
+      loop:
+        - "deb https://repos.influxdata.com/ubuntu {{ ansible_distribution_release }} stable"
+    - name: Install Telegraf
+      apt:
+        name:
+          - telegraf
+  become: yes
diff --git a/site.yml b/site.yml
index 59c5444..4b7abdb 100755
--- a/site.yml
+++ b/site.yml
@@ -31,6 +31,8 @@
       tags: [ common, snmpd ]
     - role: influxdb
       tags: [ common, influxdb ]
+    - role: telegraf
+      tags: [ common, telegraf ]
 - import_playbook: playbooks/dns.yml
 - import_playbook: playbooks/dbservers.yml
 - import_playbook: playbooks/webservers.yml