diff --git a/ansible/roles/monasca/tasks/upgrade.yml b/ansible/roles/monasca/tasks/upgrade.yml
index 20eeaaf56d..d42398e4ab 100644
--- a/ansible/roles/monasca/tasks/upgrade.yml
+++ b/ansible/roles/monasca/tasks/upgrade.yml
@@ -29,6 +29,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
   when:
+    - inventory_hostname in groups['monasca-grafana']
     - inventory_hostname != groups['monasca-grafana']|first
     - monasca_grafana_differs['result']