diff --git a/playbooks/install_monitoring_stack.yml b/playbooks/install_monitoring_stack.yml
index 370ee1e..5630bf1 100644
--- a/playbooks/install_monitoring_stack.yml
+++ b/playbooks/install_monitoring_stack.yml
@@ -17,7 +17,7 @@
   hosts: grafana
   become: true
   roles:
-    - role: cloudalchemy.grafana
+    - role: grafana.grafana.grafana
 
 - name: Import templated Grafana dashboard
   hosts: grafana
@@ -32,7 +32,7 @@
         mode: 0640
       loop:
         - "{{ playbook_dir }}/../files/dashboards/subnets.json.j2"
-      when: grafana_subnets_dashboard_variables is defined
+      when: (grafana_subnets_dashboard_variables | default([]) | length) >  0
       register: template_subnets
 
     - name: Restart Grafana
diff --git a/requirements.yml b/requirements.yml
index 94d415d..ad8c8eb 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,9 +4,9 @@
 collections:
   - name: prometheus.prometheus
     version: 0.4.0
+  - name: grafana.grafana
+    version: 2.2.5
 
 roles:
   - name: geerlingguy.docker
     version: 6.1.0
-  - name: cloudalchemy.grafana
-    version: 0.18.0