diff --git a/ansible/playbooks/roles/grafana/tasks/upgrade/main.yml b/ansible/playbooks/roles/grafana/tasks/upgrade/main.yml
index dd1fa2ca9e..f368c9cab2 100644
--- a/ansible/playbooks/roles/grafana/tasks/upgrade/main.yml
+++ b/ansible/playbooks/roles/grafana/tasks/upgrade/main.yml
@@ -71,6 +71,3 @@
       file:
         path: "{{ upgrade_defaults.state_file_path }}"
         state: absent
-
-- name: Change password
-  include_tasks: password_change.yml
diff --git a/cli/engine/ansible/AnsibleVarsGenerator.py b/cli/engine/ansible/AnsibleVarsGenerator.py
index bf27c7a231..1749e0e2c0 100644
--- a/cli/engine/ansible/AnsibleVarsGenerator.py
+++ b/cli/engine/ansible/AnsibleVarsGenerator.py
@@ -68,7 +68,7 @@ def generate(self):
             # is changed between versions (e.g. wal_keep_segments -> wal_keep_size) and sometimes previous parameters
             # are not compatible with the new ones, defaults are used for template processing
             roles_with_defaults = [
-                'grafana', 'haproxy', 'image_registry', 'jmx_exporter', 'kafka_exporter',
+                'haproxy', 'image_registry', 'jmx_exporter', 'kafka_exporter',
                 'node_exporter', 'postgresql', 'repository'
                 ]
             # now lets add any external configs we want to load
diff --git a/docs/changelogs/CHANGELOG-1.3.md b/docs/changelogs/CHANGELOG-1.3.md
index 91d83e498d..8bb844b774 100644
--- a/docs/changelogs/CHANGELOG-1.3.md
+++ b/docs/changelogs/CHANGELOG-1.3.md
@@ -40,7 +40,7 @@
 - [#2774](https://github.com/epiphany-platform/epiphany/issues/2774) - Issue creating service principle on Azure
 - [#2737](https://github.com/epiphany-platform/epiphany/issues/2737) - Fix asserting number of postgres nodes
 - [#1175](https://github.com/epiphany-platform/epiphany/issues/1175) - Task 'Join to Kubernetes cluster' may fail when Ansible vault already exists
-- [#2420](https://github.com/epiphany-platform/epiphany/issues/2420) - Changing Grafana admin password in the upgrade mode
+- [#2420](https://github.com/epiphany-platform/epiphany/issues/2420) - Changing Grafana admin password in the apply mode
 
 ### Updated