diff --git a/.gitlab/ci/lava-test.yml b/.gitlab/ci/lava-test.yml
index 999496c53c5ba6cd663d540c26904eb7eabd9f0f..23eeb3f28300d56fcbe0b98c181fd814cb1dd0c6 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
 ---
@@ -87,7 +87,7 @@
     - |
       jfrog config add artifactory-aws --interactive=false \
       --artifactory-url=$ARTIFACTORY_AWS_URL --user=$ARTIFACTORY_USER \
-      --access-token=$ARTIFACTORY_PASS;
+      --password=$ARTIFACTORY_PASS;
     - 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}"
@@ -139,7 +139,7 @@
     - |
       jfrog config add artifactory-aws --interactive=false \
       --artifactory-url=$ARTIFACTORY_AWS_URL --user=$ARTIFACTORY_USER \
-      --access-token=$ARTIFACTORY_PASS;
+      --password=$ARTIFACTORY_PASS;
     - 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}"
diff --git a/.gitlab/lava/n1sdp/acs_suite.yml.j2 b/.gitlab/lava/n1sdp/acs_suite.yml.j2
index f966b7d5c80e722fa71911385531fc43222b2fde..980ef1de9b77829d3184dc34df77b1c923702ded 100644
--- a/.gitlab/lava/n1sdp/acs_suite.yml.j2
+++ b/.gitlab/lava/n1sdp/acs_suite.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
 ---
@@ -273,7 +273,7 @@ actions:
               - apt -q update
               - apt -q install -y curl
               - curl -fL https://getcli.jfrog.io/v2 | sh
-              - ./jfrog config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --access-token={{ ARTIFACTORY_PASS }};
+              - ./jfrog config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }};
               - lsblk
               - mkdir acs
               - mount /dev/sda2 acs
diff --git a/.gitlab/lava/n1sdp/ptest.yml.j2 b/.gitlab/lava/n1sdp/ptest.yml.j2
index 34778b09263ccfa38e8848bcbfe5ac5c9edae630..0c6fdf8c670dc9d091d89724e08dbb27bdc239d3 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
 ---
@@ -194,7 +194,7 @@ actions:
           run:
             steps:
               - lava-test-case cassini-integration-tests --shell "ptest-runner"
-              - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --access-token={{ ARTIFACTORY_PASS }};
+              - jfrog-cli config add artifactory-aws --interactive=false --artifactory-url={{ ARTIFACTORY_AWS_URL }} --user={{ ARTIFACTORY_USER }} --password={{ ARTIFACTORY_PASS }};
               - |
                 cat << EOF > ./upload_spec.json
                 {