diff --git a/roles/graylog/defaults/main.yml b/roles/graylog/defaults/main.yml
index fcc628c..56917f6 100644
--- a/roles/graylog/defaults/main.yml
+++ b/roles/graylog/defaults/main.yml
@@ -58,6 +58,9 @@ graylog_es_cluster_name: elasticsearch
 graylog_mongodb_uri:
   - mongodb://localhost/graylog
 
+# Max size of Graylog journal, in GB
+graylog_journal_max_size: 5
+
 # If you want to obtain a cert with dehydrated
 # it'll be deployed as {{ graylog_root_dir }}/ssl/cert.pem and {{ graylog_root_dir }}/ssl/key.pem
 # graylog_letsencrypt_cert: graylog.domain.tls
diff --git a/roles/graylog/templates/graylog-server.service.j2 b/roles/graylog/templates/graylog-server.service.j2
index 1f4b1f0..ecd2a8e 100644
--- a/roles/graylog/templates/graylog-server.service.j2
+++ b/roles/graylog/templates/graylog-server.service.j2
@@ -12,7 +12,7 @@ User=graylog
 Group=graylog
 LimitNOFILE=64000
 ExecStart=/usr/bin/java \
-            -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB \
+            -Xms2g -Xmx2g -XX:NewRatio=1 -server -XX:+ResizeTLAB \
             -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled \
             -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow \
             -cp {{ graylog_root_dir }}/app/graylog.jar{% if graylog_libs.keys() | list | length > 0 %}{% for lib in graylog_libs.keys() | list %}:{{ graylog_root_dir }}/app/lib/{{ lib }}-{{ graylog_libs[lib].version }}.jar{% endfor %} {% endif %} \
diff --git a/roles/graylog/templates/server.conf.j2 b/roles/graylog/templates/server.conf.j2
index 432caee..0d6f2d2 100644
--- a/roles/graylog/templates/server.conf.j2
+++ b/roles/graylog/templates/server.conf.j2
@@ -37,6 +37,7 @@ bin_dir = {{ graylog_root_dir }}/app/bin
 data_dir = {{ graylog_root_dir }}/data
 plugin_dir = {{ graylog_root_dir }}/app/plugin
 message_journal_dir = {{ graylog_root_dir }}/data/journal
+message_journal_max_size = {{ graylog_journal_max_size }}gb
 
 allow_leading_wildcard_searches = true
 
diff --git a/roles/matrix_riot/defaults/main.yml b/roles/matrix_riot/defaults/main.yml
index 10c5673..2cdf5d3 100644
--- a/roles/matrix_riot/defaults/main.yml
+++ b/roles/matrix_riot/defaults/main.yml
@@ -5,9 +5,9 @@
 riot_id: riot
 
 # Version to deploy, and expected sha1
-riot_version: 1.6.2
+riot_version: 1.6.3
 # sha1sum of the tar.gz
-riot_archive_sha1: 47b621455e3003dbae586fc1778403c5de4a1581
+riot_archive_sha1: 2161193dc33d1fbd452f459d83af59e695cf25bf
 
 # Where to install riot
 riot_root_dir: /opt/matrix/riot