diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 54c346c6..bf811636 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -4,12 +4,18 @@
     name: apt-transport-https
     state: present
     update_cache: true
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded
 
 - name: Import Grafana GPG signing key
   apt_key:
     url: https://packages.grafana.com/gpg.key
     state: present
     validate_certs: false
+  register: apt_key_result
+  retries: 3
+  until: apt_key_result is succeeded
 
 - name: Add Grafana repository
   apt_repository:
@@ -21,6 +27,9 @@
   apt:
     name: grafana
     state: present
+  register: apt_result
+  retries: 3
+  until: apt_result is succeeded
 
 - name: Configure Grafana
   ini_file:
@@ -28,7 +37,7 @@
     section: "{{ item.section }}"
     option: "{{ item.option }}"
     value: "{{ item.value }}"
-    mode: 640
+    mode: 0640
   loop:
     - section: server
       option: root_url