diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23fb8bd..6dc12fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,7 +165,7 @@ test-update-tag:
     untracked: true
     paths:
       - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
   stage: repo
   image: registry.gitlab.com/packaging/reprepro-multiple-versions:latest
   script:
@@ -174,39 +174,40 @@ test-update-tag:
     - curl -L https://gitlab.com/packaging/utils/-/raw/main/repo.sh |
        bash -s -- gitea
 
-repo-tag:
+repo-apt-tag:
   <<: [*repo]
   needs:
     - gitea-amd64-tag
     - gitea-arm64-tag
     - test-install-tag
     - test-update-tag
-  only:
-    - tags
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE != "trigger"
 
-repo-trigger:
+
+repo-apt-trigger:
   <<: [*repo]
   needs:
     - gitea-amd64-trigger
     - gitea-arm64-trigger
     - test-install-trigger
     - test-update-trigger
-  only:
-    - triggers
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE == "trigger"
 
 pages:
   cache:
     untracked: true
     paths:
       - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
     policy: pull
   stage: pages
   image: ubuntu:focal
   needs:
-    - job: repo-tag
+    - job: repo-apt-tag
       optional: true
-    - job: repo-trigger
+    - job: repo-apt-trigger
       optional: true
   script:
     - mkdir $CI_PROJECT_DIR/public