diff --git a/roles/gitlab/templates/docker-compose.yml b/roles/gitlab/templates/docker-compose.yml
index d5b6440..da86bca 100644
--- a/roles/gitlab/templates/docker-compose.yml
+++ b/roles/gitlab/templates/docker-compose.yml
@@ -176,6 +176,15 @@ services:
 {% endif %}
 {% endif %}
 
+{% if gitlab_log_tmpfs %}
+        # Configure logging to only retain 10 log files, of 10MiB each
+        # This should prevent the tmpfs from overflowing
+        logging['svlogd_size'] = 10 * 1024 * 1024
+        logging['svlogd_num'] = 5
+        logging['logrotate_maxsize'] = 10 * 1024 * 1024
+        logging['logrotate_rotate'] = 5
+{% endif %}
+
     labels:
       - "traefik.http.routers.gitlab.rule=Host(`{{ gitlab_domain }}`) && PathPrefix(`/`)"
       - "traefik.http.routers.gitlab.entrypoints=websecure"