diff --git a/flux/oas/grafana.yaml b/flux/oas/grafana.yaml
index b65ee91c683ae1988f81b8c4b8013db069c090f9..1b7bbfe80025f540a50c33d54747bccd844743c9 100644
--- a/flux/oas/grafana.yaml
+++ b/flux/oas/grafana.yaml
@@ -11,7 +11,7 @@ spec:
   chart:
     repository: https://grafana.github.io/helm-charts
     name: grafana
-    version: 5.1.4
+    version: 6.2.1
   valuesFrom:
     - secretKeyRef:
         name: grafana-settings
diff --git a/test/behave/features/grafana.feature b/test/behave/features/grafana.feature
index cd4c0dbe5820df25dffc8e8f3d7835939cad28f2..418e12e77bfa498183b4c6c3cdab71f864aa91ca 100644
--- a/test/behave/features/grafana.feature
+++ b/test/behave/features/grafana.feature
@@ -14,6 +14,6 @@ Scenario: Login to grafana
   Given the element "//input[@name='user']" is visible
   When I enter the "grafana" "username" in the inputfield "//input[@name='user']"
   And I enter the "grafana" "password" in the inputfield "//input[@name='password']"
-  And I click on the button "//div[@id='login-view']//button[@aria-label='Login button']"
+  And I click on the button "//button[@aria-label='Login button']"
   Then I wait on element "sidemenu.sidemenu" for 60000ms to be visible
   And I expect that the path is "/"