diff --git a/.gitlab/ci/cassini-build.yml b/.gitlab/ci/cassini-build.yml
index 3333f1b5a6c417c729300ec725ff79b359b6fd9f..e273f4b3c2d207aa5556065393a9b5e12d94cb84 100644
--- a/.gitlab/ci/cassini-build.yml
+++ b/.gitlab/ci/cassini-build.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
diff --git a/.gitlab/ci/lava-test.yml b/.gitlab/ci/lava-test.yml
index 0e8256710355846cb80c933b456bda76f7e780c2..a1725bad2ff17b84419d2afc722e47feb8d311b2 100644
--- a/.gitlab/ci/lava-test.yml
+++ b/.gitlab/ci/lava-test.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -80,14 +80,16 @@
       jfrog config add artifactory-aws --interactive=false \
       --artifactory-url=$ARTIFACTORY_AWS_URL --user=$ARTIFACTORY_USER \
       --access-token=$ARTIFACTORY_PASS;
-    - echo LAUNCH_CI_JOB_ID=$LAUNCH_CI_JOB_ID
+    - echo LAUNCH_CI_JOB_NAME_AND_ID="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
+    - jobinfo="${LAUNCH_CI_JOB_NAME}/${LAUNCH_CI_JOB_ID}"
+    - buildid="oss-cassini/${CI_PROJECT_PATH}/${jobinfo}"
     - |
       cat << EOF > ./download_spec.json
       {
         "files": [
           {
             "pattern": "oss-cassini.lava-images-temp/ptest-runner-results/",
-            "build": "${CI_PROJECT_PATH}/${LAUNCH_CI_JOB_ID}",
+            "build": "${buildid}",
             "flat": "false",
             "recursive": "true"
           }
diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2
index c82c6a97d990d68e5e2d310ec5970043083fae12..3f62ab850eccb6378bce076b5f582901903ab13c 100644
--- a/.gitlab/lava/n1sdp/ptest.yml.j2
+++ b/.gitlab/lava/n1sdp/ptest.yml.j2
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved.
+# Copyright (c) 2022-2023 Arm Limited or its affiliates. All rights reserved.
 #
 # SPDX-License-Identifier: MIT
 ---
@@ -203,13 +203,14 @@ actions:
                   ]
                 }
                 EOF
-              - jfrog-cli rt upload --spec=upload_spec.json --build-name="{{ CI_PROJECT_PATH }}" --build-number="{{ CI_JOB_ID }}"
+              - build_name="oss-cassini/{{ CI_PROJECT_PATH }}/{{ CI_JOB_NAME }}"
+              - jfrog-cli rt upload --spec=upload_spec.json --build-name="${build_name}" --build-number="{{ CI_JOB_ID }}"
               # Collect environment variables and attach them to a build.
-              - jfrog-cli rt build-collect-env "{{ CI_PROJECT_PATH }}" "{{ CI_JOB_ID }}"
+              - jfrog-cli rt build-collect-env "${build_name}" "{{ CI_JOB_ID }}"
               # Publish build info to Artifactory
-              - jfrog-cli rt build-publish "{{ CI_PROJECT_PATH }}" "{{ CI_JOB_ID }}" --build-url="{{ CI_PROJECT_URL }}"
+              - jfrog-cli rt build-publish "${build_name}" "{{ CI_JOB_ID }}" --build-url="{{ CI_PROJECT_URL }}"
               # Discard builds and artifacts previously published to Artifactory
-              - jfrog-cli rt build-discard "{{ CI_PROJECT_PATH }}" --max-builds=10 --delete-artifacts --async
+              - jfrog-cli rt build-discard "${build_name}" --max-builds=10 --delete-artifacts --async
         from: inline
         name: cassini-integration-tests
         path: inline/cassini-integration-tests.yaml