diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index fd3084bbb3..6e01a861e4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -90,7 +90,7 @@ RUN echo {{ oraclelinux_contentdir }} >> /etc/yum/vars/contentdir
         'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
         'https://repos.influxdata.com/influxdb.key',
         'https://packagecloud.io/gpg.key',
-        'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana',
+        'https://packages.grafana.com/gpg.key',
         'https://packages.treasuredata.com/GPG-KEY-td-agent'
     ] %}
 {% endif %}
@@ -330,7 +330,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
     {# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #}
     {# 177F4010FE56CA3336300305F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
     {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
-    {# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #}
     {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
     {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #}
     {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #}
@@ -342,7 +341,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       '05CE15085FC09D18E99EFB22684A14CF2582E0C5',
       '177F4010FE56CA3336300305F1656F24C74CD1D8',
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
-      '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
       '49B07274951063870A8B7EAE7B8AA1A344C05248',
       '4D1BB29D63D98E422B2113B19334A25F8507EFA5',
@@ -352,6 +350,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       'A20F259AEB9C94BB'
     ] %}
     {% set remote_apt_keys = [
+      'https://packages.grafana.com/gpg.key'
     ] %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
@@ -359,13 +358,13 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       '0xcbcb082a1bb943db',
       'D27D666CD88E42B4',
       '05CE15085FC09D18E99EFB22684A14CF2582E0C5',
-      '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
       '901F9177AB97ACBE',
     ] %}
     {% set remote_apt_keys = [
       'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key',
       'https://bintray.com/user/downloadSubjectPublicKey?username=bintray',
-      'https://download.docker.com/linux/debian/gpg'
+      'https://download.docker.com/linux/debian/gpg',
+      'https://packages.grafana.com/gpg.key'
     ] %}
     {% set base_apt_packages = base_apt_packages +
       ['sudo',]
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo
index dc8d30b445..f4b6f1f3f1 100644
--- a/docker/base/grafana.repo
+++ b/docker/base/grafana.repo
@@ -1,7 +1,9 @@
 [grafana]
 name=grafana
-baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch
+baseurl=https://packages.grafana.com/oss/rpm
 repo_gpgcheck=1
 enabled=1
 gpgcheck=1
-gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana
+gpgkey=https://packages.grafana.com/gpg.key
+sslverify=1
+sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index da74a7dc34..f7568de167 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -8,7 +8,7 @@ deb http://security.debian.org/debian-security stretch/updates main
 # ceph, libvirt, opendaylight, openvswitch, qemu
 deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./
 
-deb [arch=amd64] https://packagecloud.io/grafana/stable/debian/ stretch main
+deb https://packages.grafana.com/oss/deb stable main
 
 # Unofficial repository for grafana (LP: #1768585).
 deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index ce5919edb2..6dd4b95f47 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -19,7 +19,7 @@ deb https://artifacts.elastic.co/packages/5.x/apt stable main
 deb https://repos.influxdata.com/ubuntu bionic stable
 
 # Grafana repo
-deb https://packagecloud.io/grafana/stable/debian/ jessie main
+deb https://packages.grafana.com/oss/deb stable main
 
 # Fluentd repo
 deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib