diff --git a/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service b/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service
index 2c49032f6a2b4e3e8c47b1885e5780f6d57a1742..9c8af73bbb2497c119e5ce72f87ca2e0acdb13f4 100644
--- a/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service
+++ b/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service
@@ -3,5 +3,6 @@ Description=Cleanup containers, images and volumes produced by GitLab Runner
 
 [Service]
 Type=oneshot
-ExecStart=docker system prune --force --filter label=com.gitlab.gitlab-runner.managed=true --volumes
+ExecStart=docker system prune --force --filter label=com.gitlab.gitlab-runner.managed=true
+ExecStart=docker volume prune --all --force --filter label=com.gitlab.gitlab-runner.managed=true
 ExecStart=docker image prune --all --force --filter until=168h