diff --git a/koji.spec b/koji.spec
index 02db09f2..96d74120 100644
--- a/koji.spec
+++ b/koji.spec
@@ -594,6 +594,8 @@ rm -rf $RPM_BUILD_ROOT
 %files utils
 %{_sbindir}/kojira
 %if %{use_systemd}
+%{_unitdir}/koji-gc.service
+%{_unitdir}/koji-gc.timer
 %{_unitdir}/kojira.service
 %else
 %{_initrddir}/kojira
diff --git a/util/Makefile b/util/Makefile
index 66b3e28a..0aa7e5cb 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -32,6 +32,8 @@ _install:
 install-systemd: _install
 	mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 	install -p -m 644 kojira.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+	install -p -m 644 koji-gc.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+	install -p -m 644 koji-gc.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 	install -p -m 644 koji-sweep-db.service $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 	install -p -m 644 koji-sweep-db.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
 
diff --git a/util/koji-gc.service b/util/koji-gc.service
new file mode 100644
index 00000000..cb8c60c5
--- /dev/null
+++ b/util/koji-gc.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Koji garbage collection
+Documentation=https://docs.pagure.org/koji/utils/
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/koji-gc --lock-file=/var/lock/koji-gc.lock --exit-on-lock
diff --git a/util/koji-gc.timer b/util/koji-gc.timer
new file mode 100644
index 00000000..573d4d9d
--- /dev/null
+++ b/util/koji-gc.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily Koji garbage collection
+Documentation=https://docs.pagure.org/koji/utils/
+
+[Timer]
+OnCalendar=daily
+Persistent=true
+
+[Install]
+WantedBy=timers.target