diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index 37edba83f1..03d4d7a6fc 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -60,6 +60,14 @@
     dest: /root/fedora-qa
   register: gitqa
 
+# TEMPORARY cleanup of old systemd units/timers
+- name: Disable and stop old systemd timers
+  service: name=check-compose-{{ item }}.timer enabled=no state=stopped
+  with_items:
+  - branched
+  - postrelease
+  - rawhide
+
 - name: Build check-compose
   command: "make prefix=/usr"
   args:
@@ -81,9 +89,5 @@
   tags:
   - config
 
-- name: Enable and start timers
-  service: name=check-compose-{{ item }}.timer enabled=yes state=started
-  with_items:
-  - branched
-  - rawhide
-  - postrelease
+- name: Enable and start daemon
+  service: name=check-compose.service enabled=yes state=started