diff --git a/roles/gitlab/tasks/main.yml b/roles/gitlab/tasks/main.yml
index 79e59b1a504a776639a4519f4622307fe7011cf3..986381b5438f87f832f2848b041eef2eaed068c9 100644
--- a/roles/gitlab/tasks/main.yml
+++ b/roles/gitlab/tasks/main.yml
@@ -19,6 +19,7 @@
     network_mode: host
     pull: true
     restart_policy: always
+    log_driver: journald
     env:
       # See https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
       # 1. In order to figure out what needs to go into 'idp_cert_fingerprint', run
diff --git a/roles/gitlab_runner/files/daemon.json b/roles/gitlab_runner/files/daemon.json
index b8194f0ea74d3cd9d777bf436556c3ff8ddc7fcc..85ff0799d46803176407f4241d151c92d5e92586 100644
--- a/roles/gitlab_runner/files/daemon.json
+++ b/roles/gitlab_runner/files/daemon.json
@@ -1,5 +1,6 @@
 {
 	"ipv6": true,
 	"fixed-cidr-v6": "fd00::/80",
-	"cgroup-parent": "docker.slice"
+	"cgroup-parent": "docker.slice",
+	"log-driver": "journald"
 }