diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 220d997e0..6d1d5888d 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -28,7 +28,7 @@ matrix_identity_server_url: "https://{{ matrix_synapse_trusted_third_party_id_se
 matrix_docker_network: "matrix"
 
 
-matrix_synapse_docker_image: "matrixdotorg/synapse:v0.33.8"
+matrix_synapse_docker_image: "matrixdotorg/synapse:v0.33.9"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
 matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config"
@@ -50,7 +50,7 @@ matrix_synapse_registration_shared_secret: "{{ matrix_synapse_macaroon_secret_ke
 matrix_synapse_form_secret: "{{ matrix_synapse_macaroon_secret_key }}"
 
 # These are the identity servers that would be trusted by Synapse if mxisd is NOT enabled
-matrix_synapse_id_servers_public: ['vector.im', 'riot.im', 'matrix.org']
+matrix_synapse_id_servers_public: ['vector.im', 'matrix.org']
 
 # These are the identity servers that would be trusted by Synapse if mxisd IS enabled
 matrix_synapse_id_servers_own: "['{{ hostname_matrix }}']"
@@ -63,9 +63,9 @@ matrix_synapse_max_upload_size_mb: 10
 matrix_synapse_max_log_file_size_mb: 100
 matrix_synapse_max_log_files_count: 10
 
-# Log levels 
+# Log levels
 # Possible options are defined here https://docs.python.org/3/library/logging.html#logging-levels
-# warning: setting log level to DEBUG will make synapse log sensitive information such 
+# warning: setting log level to DEBUG will make synapse log sensitive information such
 # as access tokens
 matrix_synapse_log_level: "INFO"
 matrix_synapse_storage_sql_log_level: "INFO"
@@ -258,7 +258,7 @@ matrix_corporal_debug: false
 # you may wish to disable this.
 matrix_riot_web_enabled: true
 
-matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.3"
+matrix_riot_web_docker_image: "avhost/docker-matrix-riot:v0.17.6"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"