diff --git a/defaults/main.yml b/defaults/main.yml
index 7f8edad..6e2e0d6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
-grafana_repo_key: https://packages.grafana.com/gpg.key
-grafana_repo: deb https://packages.grafana.com/oss/deb stable main
+grafana_repo_key: https://apt.grafana.com/gpg.key
+grafana_repo: "deb [signed-by=/usr/share/keyrings/grafana.key] https://apt.grafana.com stable main"
 grafana_pkg_state: latest
 grafana_packages:
   - grafana
diff --git a/tasks/main.yml b/tasks/main.yml
index 0e04cab..ef5293e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,10 +13,19 @@
   tags: [grafana]
 - block:
     - name: Install the grafana repo key
-      apt_key: url={{ grafana_repo_key }} state=present
+      get_url:
+        url: "{{ grafana_repo_key }}"
+        dest: /usr/share/keyrings/grafana.key
+        state: present
+        owner: root
+        group: root
+        mode: 0644
 
     - name: Install the grafana deb repository
-      apt_repository: repo='{{ grafana_repo }}' state=present update_cache=yes
+      apt_repository:
+        repo: "{{ grafana_repo }}"
+        state: present
+        update_cache: true
 
     - name: Install the grafana deb packages
       apt: name={{ grafana_packages }} state={{ grafana_pkg_state }} update_cache=yes cache_valid_time=1800