diff --git a/.github/workflows/issue-labeler.yml b/.github/workflows/issue-labeler.yml
index 9f93b586..4f542926 100644
--- a/.github/workflows/issue-labeler.yml
+++ b/.github/workflows/issue-labeler.yml
@@ -94,13 +94,17 @@ jobs:
               title.includes('cve') || body.includes('cve')) {
             labels.push('security');
           }
-          
-          // Add labels if any were found
-          if (labels.length > 0) {
+              
+          const issue_number = context.payload.issue?.number;
+
+          console.log(`Issue title: ${title}`);
+          console.log(`Computed labels: ${labels}`);
+
+          if (issue_number && labels.length > 0) {
             await github.rest.issues.addLabels({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: labels
+              issue_number,
+              labels
             });
-          } 
\ No newline at end of file
+          }
\ No newline at end of file
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index e8924310..9d48a3d4 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -55,10 +55,16 @@
                 labels.push('x86_64');
               }
                 
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                labels: labels
-              });
+              const pr_number = context.payload.pull_request?.number;
+              console.log(`PR number: ${pr_number}`);
+              console.log(`Computed labels: ${labels}`);
+
+              if (pr_number && labels.length > 0) {
+                await github.rest.issues.addLabels({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: pr_number,
+                  labels: labels
+                });
+              }
             
\ No newline at end of file