diff --git a/.github/actions/e2e/action.yml b/.github/actions/e2e/action.yml
index b08b4a4c91..868275f841 100644
--- a/.github/actions/e2e/action.yml
+++ b/.github/actions/e2e/action.yml
@@ -33,6 +33,7 @@ inputs:
     description: check ps cloud env
     default: "false"
   e2e-tar-name: #
+    description: tarball name
     required: false
     default: e2e.tar.gz
   apa-proxy: #
@@ -77,7 +78,7 @@ runs:
     - name: download smartrunner test results from s3 bucket if they exist
       shell: bash
       env:
-        REMOTE_PATH: smart-runner/${{ github.run_id}}/${{ inputs.e2e-test-folder }}-${{ inputs.e2e-test-id}}/e2e.tar.gz
+        REMOTE_PATH: smart-runner/${{ github.run_id}}/${{ inputs.e2e-test-folder }}-${{ inputs.e2e-artifact-id}}/e2e.tar.gz
       run: |
         set -u;
         mkdir -p "${SMART_RUNNER_PATH}"
@@ -186,14 +187,14 @@ runs:
       if: ${{ steps.determine-affected.outputs.isAffected == 'true' }}
       uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
       with:
-        name: e2e-artifact-output-${{inputs.e2e-test-id}}
+        name: e2e-artifact-output-${{inputs.e2e-artifact-id}}
         path: /home/runner/work/alfresco-ng2-components/alfresco-ng2-components/e2e-output-*
 
     - name: upload smart-runner tests results on s3 to cache tests
       shell: bash
       if: always()
       env:
-        REMOTE_PATH: "smart-runner/${{ github.run_id}}/${{ inputs.e2e-test-folder }}-${{ inputs.e2e-test-id}}/e2e.tar.gz"
+        REMOTE_PATH: "smart-runner/${{ github.run_id}}/${{ inputs.e2e-test-folder }}-${{inputs.e2e-artifact-id}}/e2e.tar.gz"
       # description: always upload newer results
       run: |
         tar czf "${{ inputs.e2e-tar-name }}" "${SMART_RUNNER_PATH}"
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 02c0482079..db0002ada5 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -11,7 +11,7 @@ on:
       devel:
         description: 'devel'
         required: false
-        type: string
+        type: boolean
         default: false
       cron-run:
         description: 'disables jobs which should not run when cron runs e2es'
@@ -308,6 +308,7 @@ jobs:
         e2e-test:
           - description: "Core"
             test-id: "core"
+            artifact-id: "core"
             folder: "core"
             provider: "ALL"
             auth: "OAUTH"
@@ -315,49 +316,56 @@ jobs:
             check-ps-env: "true"
             deps: "testing"
           - description: "Content: Components"
-            test-id: "content-services-components"
+            test-id: "content-services"
+            artifact-id: "content-services-components"
             folder: "content-services/components"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Content: Directives"
-            test-id: "content-services-directives"
+            test-id: "content-services"
+            artifact-id: "content-services-directives"
             folder: "content-services/directives"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Content: Document List"
-            test-id: "content-services-document-list"
+            test-id: "content-services"
+            artifact-id: "content-services-document-list"
             folder: "content-services/document-list"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Content: Metadata"
-            test-id: "content-services-metadata"
+            test-id: "content-services"
+            artifact-id: "content-services-metadata"
             folder: "content-services/metadata"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Content: Upload and Versioning"
-            test-id: "content-services-upload"
+            test-id: "content-services"
+            artifact-id: "content-services-upload"
             folder: "content-services/upload"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Search"
-            test-id: "content-services-search"
+            test-id: "content-services"
+            artifact-id: "content-services-search"
             folder: "search"
             provider: "ECM"
             auth: "BASIC"
             check-cs-env: "true"
             deps: "testing"
           - description: "Process: Form"
-            test-id: "process-services-form"
+            test-id: "process-services"
+            artifact-id: "process-services-form"
             folder: "process-services/form"
             provider: "BPM"
             auth: "OAUTH"
@@ -365,7 +373,8 @@ jobs:
             check-external-cs-env: "true"
             deps: "testing"
           - description: "Process: Process"
-            test-id: "process-services-process"
+            test-id: "process-services"
+            artifact-id: "process-services-process"
             folder: "process-services/process"
             provider: "BPM"
             auth: "OAUTH"
@@ -373,7 +382,8 @@ jobs:
             check-external-cs-env: "true"
             deps: "testing"
           - description: "Process: Tasks"
-            test-id: "process-services-tasks"
+            test-id: "process-services"
+            artifact-id: "process-services-tasks"
             folder: "process-services/tasks"
             provider: "BPM"
             auth: "OAUTH"
@@ -381,7 +391,8 @@ jobs:
             check-external-cs-env: "true"
             deps: "testing"
           - description: "Process: Widget"
-            test-id: "process-services-widgets"
+            test-id: "process-services"
+            artifact-id: "process-services-widgets"
             folder: "process-services/widgets"
             provider: "BPM"
             auth: "OAUTH"
@@ -389,7 +400,8 @@ jobs:
             check-external-cs-env: "true"
             deps: "testing"
           - description: "Process Cloud: Form"
-            test-id: "process-services-cloud-form-field"
+            test-id: "process-services-cloud"
+            artifact-id: "process-services-cloud-form-field"
             folder: "process-services-cloud/form-field"
             provider: "ALL"
             auth: "OAUTH"
@@ -398,7 +410,8 @@ jobs:
             check-ps-cloud-env: "true"
             deps: "testing"
           - description: "Process Cloud: Process"
-            test-id: "process-services-cloud-process"
+            test-id: "process-services-cloud"
+            artifact-id: "process-services-cloud-process"
             folder: "process-services-cloud/process"
             provider: "ALL"
             auth: "OAUTH"
@@ -407,7 +420,8 @@ jobs:
             check-ps-cloud-env: "true"
             deps: "testing"
           - description: "Process Cloud: Start Task"
-            test-id: "process-services-cloud-start-task"
+            test-id: "process-services-cloud"
+            artifact-id: "process-services-cloud-start-task"
             folder: "process-services-cloud/start-task"
             provider: "ALL"
             auth: "OAUTH"
@@ -416,7 +430,8 @@ jobs:
             check-ps-cloud-env: "true"
             deps: "testing"
           - description: "Process Cloud: Tasks List"
-            test-id: "process-services-cloud-task-list"
+            test-id: "process-services-cloud"
+            artifact-id: "process-services-cloud-task-list"
             folder: "process-services-cloud/task-list"
             provider: "ALL"
             auth: "OAUTH"
@@ -442,6 +457,7 @@ jobs:
         with:
           e2e-test-id: ${{ matrix.e2e-test.test-id }}
           e2e-test-folder: ${{ matrix.e2e-test.folder }}
+          e2e-artifact-id: ${{matrix.e2e-test.artifact-id}}
           e2e-test-provider: ${{ matrix.e2e-test.provider }}
           e2e-test-auth: ${{ matrix.e2e-test.auth }}
           check-cs-env: ${{ matrix.e2e-test.check-cs-env }}
@@ -515,4 +531,3 @@ jobs:
       - name: workflow success
         run: exit 0
         if: ${{ contains(needs.*.result, 'success') }}
-