diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index b781276..e592cab 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -87,6 +87,12 @@
   notify: restart grafana
   tags: grafana
 
+  # Since Grafana 7.5.7, grafana-cli even when invoked as root takes action under the grafana user
+  # so we need to be sure permissions are OK, or plugin update/installation/removal will fail
+- name: Ensure correct permissions on data dir
+  file: path=/var/lib/grafana owner=grafana group=grafana mode=770 recurse=True
+  tags: grafana
+
 - name: Build a list of installed plugins
   shell: grafana-cli plugins ls | perl -ne '/^(\w[\-\w]+)\s\@\s\d+\./ && print "$1\n"'
   register: grafana_installed_plugins
diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml
index cb7202e..79d31e2 100644
--- a/roles/matrix_synapse/defaults/main.yml
+++ b/roles/matrix_synapse/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Synapse version to deploy
-synapse_version: 1.34.0
+synapse_version: 1.35.1
 
 # Should ansible handle Synapse upgrades ? If false, only initial install will be done
 synapse_manage_upgrade: True