diff --git a/README.md b/README.md
index 5b129d2..b36e923 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,11 @@ journalctl --user -u docker.service
 journalctl gitea-act-runner.service
 ```
 
+# Notes
+ * Now using arch gitea-runner package (official).
+ * Make sure to use /etc/gitea-runner/config.yaml
+ * Enable the cleanup timer to clean docker cache every now and then
+
 # See also
  * Mathew Guest: mat@zavage.net
  * https://gitea.com/gitea/act_runner
diff --git a/user_system/gitea-runner-docker-cleanup.service b/user_system/gitea-runner-docker-cleanup.service
new file mode 100644
index 0000000..2d5e568
--- /dev/null
+++ b/user_system/gitea-runner-docker-cleanup.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Prune docker + runner cache (rootless CI cleanup)
+
+[Service]
+Type=oneshot
+# Environment=DOCKER_HOST=unix:///run/user/1004/docker.sock
+Environment=DOCKER_HOST=unix://%t/docker.sock
+# keep one week of docker images/build cache, drop the rest
+ExecStart=/usr/bin/docker system prune -af --filter until=168h
+ExecStart=/usr/bin/docker builder prune -af --filter until=168h
+# drop runner cache entries untouched for 2+ weeks
+ExecStart=/usr/bin/find %h/.cache/actcache -type f -atime +14 -delete
+
diff --git a/user_system/gitea-runner-docker-cleanup.timer b/user_system/gitea-runner-docker-cleanup.timer
new file mode 100644
index 0000000..30d8609
--- /dev/null
+++ b/user_system/gitea-runner-docker-cleanup.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Weekly CI cleanup
+
+[Timer]
+OnCalendar=Sun 04:00
+Persistent=true
+RandomizedDelaySec=15m
+
+[Install]
+WantedBy=timers.target