diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fb086c1..fde3799 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -126,7 +126,9 @@ jobs:
           helm upgrade --install monitoring prometheus-community/kube-prometheus-stack \
             --namespace monitoring \
             --create-namespace \
-            --values helm/monitoring/values.yaml
+            --values helm/monitoring/values.yaml \
+            --skip-crds \
+            --timeout 5m
 
       - name: Deploy oauth2-proxy Prometheus
         if: ${{ inputs.service == 'all' || inputs.service == 'monitoring' }}
diff --git a/helm/monitoring/values.yaml b/helm/monitoring/values.yaml
index 1065ce5..0f9233a 100644
--- a/helm/monitoring/values.yaml
+++ b/helm/monitoring/values.yaml
@@ -29,6 +29,8 @@ grafana:
       api_url: http://keycloak-keycloakx-http.keycloak.svc.cluster.local/auth/realms/k8s-apps/protocol/openid-connect/userinfo
       email_attribute_path: email
       login_attribute_path: preferred_username
+      role_attribute_path: "contains(groups[*], 'grafana-admin') && 'Admin' || 'Viewer'"
+      role_attribute_strict: false
 
   ingress:
     enabled: true