diff --git a/templates/mailman-web.py.j2 b/templates/mailman-web.py.j2
index 82e282b..011cfa6 100644
--- a/templates/mailman-web.py.j2
+++ b/templates/mailman-web.py.j2
@@ -250,3 +250,21 @@ SESSION_EXPIRE_SECONDS = {{ mailman.web.session_timeout }}
 HYPERKITTY_ENABLE_GRAVATAR = False
 HYPERKITTY_ALLOW_WEB_POSTING = False
 
+# Fix warning:
+#
+#   UserWarning: Retry and timeout are misconfigured. Set retry larger than timeout,
+#   failure to do so will cause the tasks to be retriggered before completion.
+#   See https://django-q.readthedocs.io/en/latest/configure.html#retry for details.
+
+Q_CLUSTER = {
+    'retry': 360,
+    'timeout': 300,
+    'save_limit': 100,
+    'orm': 'default',
+}
+
+# Fix warning:
+#
+#   Auto-created primary key used when not defining a primary key type, by default 'django.db.models.AutoField'.
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'