diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 612e694..c13a6c0 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -1,48 +1,58 @@
 - name: check distribution
   assert:
     that: "ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'"
     msg: This role only supports Debian-like systems
 
-- name: import PackageCloud APT key
+- name: remove old PackageCloud repository
+  apt_repository:
+    repo: "deb https://packagecloud.io/grafana/stable/debian/ jessie main"
+    filename: grafana
+    state: absent
+
+- name: remove old PackageCloud APT key
   apt_key:
     id: D59097AB
     url: "https://packagecloud.io/gpg.key"
+    state: absent
+
+- name: import Grafana APT key
+  apt_key:
+    id: 8C8C34C524098CB6
+    url: "https://packages.grafana.com/gpg.key"
     state: present
 
 - name: add Grafana repository
   apt_repository:
-    # Grafana docs say "Use [this] line even if you are on Ubuntu or another Debian version"
-    # and indeed it has no packages in /ubuntu/.
-    repo: "deb https://packagecloud.io/grafana/stable/debian/ jessie main"
+    repo: "deb https://packages.grafana.com/oss/deb/ stable main"
     filename: grafana
     state: present
 
 - name: install Grafana package
   apt:
     name: grafana
 
 - name: install Grafana configuration
   template:
     src: grafana.ini
     dest: /etc/grafana/grafana.ini
     owner: root
     group: grafana
     mode: 0640
   notify: restart Grafana
   tags: grafana-config
 
 - name: install Grafana LDAP configuration
   template:
     src: ldap.toml
     dest: /etc/grafana/ldap.toml
     owner: root
     group: grafana
     mode: 0640
   notify: restart Grafana
   tags: grafana-config
 
 - name: start Grafana on boot
   service:
     name: grafana-server
     state: started
     enabled: yes # auto-start on boot