diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 00e4cf75f..954136be0 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -123,7 +123,7 @@ matrix_docker_image_postgres_latest: "{{ matrix_docker_image_postgres_v10 }}"
 
 matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.4"
 matrix_docker_image_nginx: "nginx:1.15.3-alpine"
-matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.3"
+matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.4"
 matrix_docker_image_goofys: "cloudproto/goofys:latest"
 matrix_docker_image_coturn: "instrumentisto/coturn:4.5.0.7"
 matrix_docker_image_mailer: "panubo/postfix:latest"
@@ -243,7 +243,7 @@ matrix_ssl_base_path: "{{ matrix_base_data_path }}/ssl"
 matrix_ssl_config_dir_path: "{{ matrix_ssl_base_path }}/config"
 matrix_ssl_log_dir_path: "{{ matrix_ssl_base_path }}/log"
 matrix_ssl_support_email: "{{ host_specific_matrix_ssl_support_email }}"
-matrix_ssl_certbot_docker_image: "certbot/certbot:v0.27.0"
+matrix_ssl_certbot_docker_image: "certbot/certbot:v0.27.1"
 matrix_ssl_certbot_standalone_http_port: 2402
 matrix_ssl_use_staging: false