diff --git a/.gitlab/ci/cassini-build.yml b/.gitlab/ci/cassini-build.yml
index 50a21993ecd43d4d919aa74bbe8a7eb5a634f8b1..6190f4f3df37dc633ab2f3d12bb19a3ce9f959f7 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
 ---
@@ -27,7 +27,7 @@
   before_script:
     - mkdir -p ~/.ssh
     - eval "$(ssh-agent -s)"
-    - if [ -z "${SSH_PRIVATE_GITLAB}+x" ]; then
+    - if [ -n "${SSH_PRIVATE_GITLAB+x}" ]; then
         echo "${SSH_PRIVATE_GITLAB}" | tr -d '\r' | ssh-add - > /dev/null;
       fi
     - ssh-keyscan -t rsa ${CI_SERVER_HOST}  >> ~/.ssh/known_hosts
diff --git a/.gitlab/ci/lava-test.yml b/.gitlab/ci/lava-test.yml
index 5e4121a30aa35e07dfeb99222274ee647b4fee3f..5da67665295b4d6585d2f35f2231fba628b8c57d 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
 ---
@@ -42,7 +42,7 @@
           echo "Building FPGA image set for Corstone1000 MPS3 board"
           mkdir -p ~/.ssh
           eval "$(ssh-agent -s)"
-          if [ -n "${SSH_PRIVATE_GERRIT}+x" ]; then
+          if [ -n "${SSH_PRIVATE_GERRIT+x}" ]; then
             echo "${SSH_PRIVATE_GERRIT}" | tr -d '\r' | ssh-add - > /dev/null;
           fi
           ssh-keyscan -t rsa ${CI_SERVER_HOST}  >> ~/.ssh/known_hosts