diff --git a/.github/actions/incremental-build/action.yaml b/.github/actions/incremental-build/action.yaml
index a880b91374197..6ca313f40801e 100644
--- a/.github/actions/incremental-build/action.yaml
+++ b/.github/actions/incremental-build/action.yaml
@@ -33,10 +33,6 @@ inputs:
     description: 'The GitHub repository name (example, apache/camel)'
     required: false
     default: ${{ github.repository }}
-  artifact-upload-suffix:
-    description: 'Suffix for artifacts stored'
-    required: false
-    default: ''
   extra-modules:
     description: 'Additional modules to test (comma-separated paths, e.g. from /component-test)'
     required: false
@@ -56,9 +52,3 @@ runs:
         EXTRA_MODULES: ${{ inputs.extra-modules }}
       shell: bash
       run: ${{ github.action_path }}/incremental-build.sh ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd "$PR_ID" "$GITHUB_REPO" "$EXTRA_MODULES"
-    - name: archive logs
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-      if: always()
-      with:
-        name: incremental-test-${{ inputs.artifact-upload-suffix }}.log
-        path: incremental-test.log
diff --git a/.github/actions/pr-id/action.yml b/.github/actions/pr-id/action.yml
index 94de6a80ebfac..8e74628477fce 100644
--- a/.github/actions/pr-id/action.yml
+++ b/.github/actions/pr-id/action.yml
@@ -16,13 +16,7 @@
 # ---------------------------------------------------------------------------
 
 name: PR id
-description: Store an artifact with the number of the PR issued
-
-inputs:
-  artifact-name:
-    default: pr-id
-    description: 'The name of the artifact to store PR id number'
-    required: true
+description: Store the number of the PR issued
 
 runs:
   using: "composite"
@@ -30,18 +24,11 @@ runs:
   steps:
 
   # Only run these on pull request events
-  - name: Save new coverage value
+  - name: Save PR id
     if: github.event_name == 'pull_request'
     shell: bash
     env:
-      ARTIFACT_NAME: ${{ inputs.artifact-name }}
       EVENT_NUMBER: ${{ github.event.number }}
     run: |
-      mkdir -p "/tmp/$ARTIFACT_NAME"
-      echo "$EVENT_NUMBER" > "/tmp/$ARTIFACT_NAME/id"
-
-  - uses: actions/upload-artifact@v4
-    if: github.event_name == 'pull_request'
-    with:
-      name: ${{ inputs.artifact-name }}
-      path: /tmp/${{ inputs.artifact-name }}/
+      mkdir -p "/tmp/pr-id"
+      echo "$EVENT_NUMBER" > "/tmp/pr-id/id"
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index dcfc80711e733..fad648617a730 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -70,4 +70,9 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           skip-mvnd-install: 'true'
-          artifact-upload-suffix: main-java-${{ matrix.java }}
+      - name: archive incremental test logs
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: always()
+        with:
+          name: incremental-test-main-java-${{ matrix.java }}.log
+          path: incremental-test.log
diff --git a/.github/workflows/pr-build-main.yml b/.github/workflows/pr-build-main.yml
index 46145ecfc366b..9588a33070821 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -114,8 +114,13 @@ jobs:
           pr-id: ${{ github.event.number || inputs.pr_number }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           skip-mvnd-install: 'true'
-          artifact-upload-suffix: java-${{ matrix.java }}
           extra-modules: ${{ inputs.extra_modules || '' }}
+      - name: archive incremental test logs
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: always()
+        with:
+          name: incremental-test-java-${{ matrix.java }}.log
+          path: incremental-test.log
       # All non-experimental JDK matrix entries upload with overwrite: true.
       # This ensures a comment is posted even if one JDK build fails — the
       # content is identical across JDKs (same modules tested), so last writer wins.
diff --git a/.github/workflows/pr-id.yml b/.github/workflows/pr-id.yml
index 831835634c2e0..3581d3a2b8cc8 100644
--- a/.github/workflows/pr-id.yml
+++ b/.github/workflows/pr-id.yml
@@ -33,6 +33,12 @@ jobs:
         uses: actions/checkout@v6
         with:
           persist-credentials: false
-          submodules: recursive    
+          submodules: recursive
       - name: Store PR id number
         uses: ./.github/actions/pr-id
+      - name: Upload PR id artifact
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        if: github.event_name == 'pull_request'
+        with:
+          name: pr-id
+          path: /tmp/pr-id/