diff --git a/cookbooks/grafana/files/etc/apt/sources.list.d/grafana.list b/cookbooks/grafana/files/etc/apt/sources.list.d/grafana.list
index 886da8d..99ece0c 100644
--- a/cookbooks/grafana/files/etc/apt/sources.list.d/grafana.list
+++ b/cookbooks/grafana/files/etc/apt/sources.list.d/grafana.list
@@ -1 +1,2 @@
-deb https://packagecloud.io/grafana/stable/debian/ jessie main
+deb https://packages.grafana.com/oss/deb stable main
+# deb-src https://packages.grafana.com/oss/deb stable main
diff --git a/cookbooks/grafana/install.rb b/cookbooks/grafana/install.rb
index a7a4993..91eb4a9 100644
--- a/cookbooks/grafana/install.rb
+++ b/cookbooks/grafana/install.rb
@@ -6,8 +6,8 @@ remote_file '/etc/apt/sources.list.d/grafana.list' do
 end
 
 # Load APT key:
-execute 'curl https://packagecloud.io/gpg.key | apt-key add -' do
-  not_if 'apt-key list | grep packagecloud'
+execute 'curl https://packages.grafana.com/gpg.key | apt-key add -' do
+  not_if 'apt-key list | grep grafana'
 end
 
 execute 'apt update'