diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 350367cd14..6e50378f10 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -299,7 +299,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 
 {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
 {% set base_remote_apt_keys = [
-   {'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
+   {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
    {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.4.x/repo_pub_key'},
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo
index aa8826dbed..002ac89294 100644
--- a/docker/base/grafana.repo
+++ b/docker/base/grafana.repo
@@ -1,8 +1,8 @@
 [grafana]
 name=grafana
-baseurl=https://packages.grafana.com/oss/rpm
+baseurl=https://rpm.grafana.com
 enabled=0
 gpgcheck=1
-gpgkey=https://packages.grafana.com/gpg.key
+gpgkey=https://rpm.grafana.com/gpg.key
 sslverify=1
 sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 3aed5d4056..84f8bbd8b6 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -38,7 +38,7 @@ debian:
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   grafana:
-    url: "https://packages.grafana.com/oss/deb"
+    url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
@@ -75,7 +75,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   grafana:
-    url: "https://packages.grafana.com/oss/deb"
+    url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
@@ -144,7 +144,7 @@ ubuntu:
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   grafana:
-    url: "https://packages.grafana.com/oss/deb"
+    url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
@@ -181,7 +181,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   grafana:
-    url: "https://packages.grafana.com/oss/deb"
+    url: "https://apt.grafana.com"
     suite: "stable"
     component: "main"
     gpg_key: "grafana.asc"
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py
index 39ef20c645..9574bb3829 100644
--- a/kolla/tests/test_methods.py
+++ b/kolla/tests/test_methods.py
@@ -66,7 +66,7 @@ class MethodsTest(base.TestCase):
         }
 
         result = methods.handle_repos(template_vars, ['grafana'], 'enable')
-        expectCmd = "RUN echo 'Uris: https://packages.grafana.com/oss/deb' "
+        expectCmd = "RUN echo 'Uris: https://apt.grafana.com' "
         expectCmd += ">/etc/apt/sources.list.d/grafana.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
@@ -99,7 +99,7 @@ class MethodsTest(base.TestCase):
 
         result = methods.handle_repos(template_vars, ['grafana', 'rabbitmq'],
                                       'enable')
-        expectCmd = "RUN echo 'Uris: https://packages.grafana.com/oss/deb' "
+        expectCmd = "RUN echo 'Uris: https://apt.grafana.com' "
         expectCmd += ">/etc/apt/sources.list.d/grafana.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "