diff --git a/.woodpecker.yml b/.woodpecker.yml
index 131f0e4..7ab4469 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -30,7 +30,8 @@ steps:
         nodeSelector:
           kubernetes.io/arch: amd64
         labels:
-          commit-ref: "${CI_COMMIT_REF}"
+          commit-tag: "${CI_COMMIT_TAG}"
+          commit-branch: "${CI_COMMIT_BRANCH}"
           pipeline-number: "${CI_PIPELINE_NUMBER}"
     commands:
       - sh ci/setup.sh
@@ -49,7 +50,8 @@ steps:
         nodeSelector:
           kubernetes.io/arch: arm64
         labels:
-          commit-ref: "${CI_COMMIT_REF}"
+          commit-tag: "${CI_COMMIT_TAG}"
+          commit-branch: "${CI_COMMIT_BRANCH}"
           pipeline-number: "${CI_PIPELINE_NUMBER}"
     commands:
       - sh ci/setup.sh
@@ -68,7 +70,8 @@ steps:
         nodeSelector:
           kubernetes.io/arch: amd64
         labels:
-          commit-ref: "${CI_COMMIT_REF}"
+          commit-tag: "${CI_COMMIT_TAG}"
+          commit-branch: "${CI_COMMIT_BRANCH}"
           pipeline-number: "${CI_PIPELINE_NUMBER}"
     commands:
       - sh ci/setup.sh