diff --git a/defaults/main.yml b/defaults/main.yml
index 00238c0..4c4bf1a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 grafana_repo_key_url: https://apt.grafana.com/gpg.key
-grafana_repo_key_file: /etc/apt/keyrings/grafana.gpg
+grafana_repo_key_file: /etc/apt/keyrings/grafana.asc
 grafana_repo_url: "https://apt.grafana.com"
 grafana_repo_components:
   - main
diff --git a/tasks/main.yml b/tasks/main.yml
index 8bdeab9..9c9d274 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -39,7 +39,6 @@
         group: root
         mode: "0644"
       tags: [grafana, grafana_repo_key]
-
     - name: Install the grafana repository for Ubuntu
       ansible.builtin.deb822_repository:
         name: grafana-com
@@ -50,7 +49,11 @@
         signed_by: "{{ grafana_repo_key_file }}"
         state: present
         enabled: true
-
+    - name: Install the grafana packages
+      ansible.builtin.apt:
+        pkg: "{{ grafana_packages }}"
+        cache_valid_time: 1800
+        state: "{{ grafana_pkg_state }}"
     - name: Basic grafana configuration
       community.general.ini_file:
         path: /etc/grafana/grafana.ini