diff --git a/group_vars/all b/group_vars/all
index 990daca..b6546be 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -169,3 +169,6 @@ cryptshot:
           interval: 6
         - level: monthly
           interval: 3
+
+journal:
+    max_size: 500M
diff --git a/roles/base/tasks/journal.yml b/roles/base/tasks/journal.yml
new file mode 100644
index 0000000..41caf37
--- /dev/null
+++ b/roles/base/tasks/journal.yml
@@ -0,0 +1,11 @@
+---
+- name: Create journal config directory
+  file: path=/etc/systemd/journald.conf.d state=directory
+  tags:
+    - journal
+
+- name: Push journal max size config
+  template: src=00-journal-size.conf.j2 dest=/etc/systemd/journald.conf.d/00-journal-size.conf.j2
+  when: journal is defined and journal.max_size is defined
+  tags:
+    - journal
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index f22e150..69da68b 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -13,3 +13,4 @@
 - include: user.yml
 - include: sudo.yml
 - include: packages.yml
+- include: journal.yml
diff --git a/roles/base/templates/00-journal-size.conf.j2 b/roles/base/templates/00-journal-size.conf.j2
new file mode 100644
index 0000000..6259a32
--- /dev/null
+++ b/roles/base/templates/00-journal-size.conf.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+[Journal]
+SystemMaxUse={{ journald.max_size }}