diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2e823c..7675f7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@ stages:
 
 .trigger: &trigger
   when: delayed
-  start_in: 1 hours
+  start_in: 2 hours
   only:
     - triggers
 
@@ -95,13 +95,11 @@ gitea-arm64-trigger:
     <<: *vars
     ARCH: arm64
 
-test-install:
+.test-install: &test-install
   stage: test
   image: docker:latest
   services:
     - docker:dind
-  needs:
-    - gitea-amd64-trigger
   script:
     - docker run
       -d
@@ -113,10 +111,8 @@ test-install:
       -e CI_COMMIT_TAG=$CI_COMMIT_TAG
       jrei/systemd-ubuntu:20.04
     - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-install.sh
-  only:
-    - tags
 
-test-update:
+.test-update: &test-update
   stage: test
   image: docker:latest
   services:
@@ -137,6 +133,34 @@ test-update:
   only:
     - tags
 
+test-install-trigger:
+  <<: *test-install
+  needs:
+    - gitea-amd64-trigger
+  only:
+    - trigger
+
+test-install-tag:
+  <<: *test-install
+  needs:
+    - gitea-amd64-tag
+  only:
+    - tags
+
+test-update-trigger:
+  <<: *test-update
+  needs:
+    - gitea-amd64-trigger
+  only:
+    - trigger
+
+test-update-tag:
+  <<: *test-update
+  needs:
+    - gitea-amd64-tag
+  only:
+    - tags
+
 reprepro:
   cache:
     untracked: true