diff --git a/automated/linux/torizon/integration-tests.sh b/automated/linux/torizon/integration-tests.sh
index 5a02e7443..15d06f461 100755
--- a/automated/linux/torizon/integration-tests.sh
+++ b/automated/linux/torizon/integration-tests.sh
@@ -4,49 +4,70 @@
 set -x
 . ../../lib/sh-test-lib
 
+UTILS_PATH=$(cd ../../utils && pwd)
+
 # source the secrets file to get the gitlab_token env var
-. ../../../../../../secrets > /dev/null 2>&1
+lava_test_dir="$(
+  dir="$(pwd)"
+  while [ "$dir" != "/" ]; do
+    find "$dir" -maxdepth 1 -type d -regex '.*/lava-[0-9]+' 2>/dev/null
+    dir=$(dirname "$dir")
+  done |
+  sort -t- -k2,2n |
+  tail -1
+)"
+if test -f "${lava_test_dir}/secrets"; then
+. "${lava_test_dir}/secrets"
+fi
 
 # Determine the appropriate packages for the architecture
-ARCH=$(uname -m)
 SPIRE_VERSION="0.3.4"
+GECKO_VERSION="v0.36.0"
+UV_VERSION="0.9.4"
 
-if [ "$ARCH" = "x86_64" ]; then
-    DRIVER="geckodriver-v0.36.0-linux64.tar.gz"
-    SPIRE="staging-spire_${SPIRE_VERSION}_linux_amd64.deb"
-
-elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-    DRIVER="geckodriver-v0.36.0-linux-aarch64.tar.gz"
-    SPIRE="staging-spire_${SPIRE_VERSION}_linux_arm64.deb"
-else
-    echo "Unknown architecture: $ARCH"
+detect_abi
+# shellcheck disable=SC2154
+case "${abi}" in
+  x86_64)
+    GECKODRIVER_ARCH="linux64"
+    SPIRE_ARCH="linux_amd64"
+    ;;
+  arm64|aarch64)
+    GECKODRIVER="linux-aarch64"
+    SPIRE_ARCH="linux_arm64"
+    ;;
+  *)
+    echo "Unknown architecture: ${abi}"
     exit 1
-fi
+    ;;
+esac
+
+GECKODRIVER="geckodriver-${GECKO_VERSION}-${GECKODRIVER_ARCH}.tar.gz"
+SPIRE="staging-spire_${SPIRE_VERSION}_${SPIRE_ARCH}.deb"
 
 # Download and install spire package
 curl -sSLO "https://github.com/Linaro/SPIRE-CLI-S-/releases/download/$SPIRE_VERSION/$SPIRE"
 dpkg -i "$SPIRE"
 
 # Download and install gecko driver
-curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.36.0/$DRIVER"
-tar -xf "$DRIVER"
+curl -LO "https://github.com/mozilla/geckodriver/releases/download/${GECKO_VERSION}/$GECKODRIVER"
+tar -xf "$GECKODRIVER"
 mv geckodriver /usr/local/bin
 chown root:root /usr/local/bin/geckodriver
 
 # Download and install uv
-curl -LsSf https://astral.sh/uv/install.sh | sh
+curl -LsSf "https://astral.sh/uv/${UV_VERSION}/install.sh" | sh
 . "$HOME"/.local/bin/env
 
 # clone baklava-integration repo and install required pip pkgs
-get_test_program "https://gitlab-ci-token:${GITLAB_TOKEN}@gitlab.com/LinaroLtd/lava/appliance/baklava-integration/docker-tests.git" "docker-tests" "main"
-git checkout "$BRANCH_NAME"
+get_test_program "https://gitlab-ci-token:${GITLAB_TOKEN}@gitlab.com/LinaroLtd/lava/appliance/baklava-integration/docker-tests.git" "docker-tests" "$BRANCH_NAME"
 
 export SPIRE_PAT_TOKEN LAVA_TOKEN LAVA_PASSWORD SQUAD_UPLOAD_URL SQUAD_ARCHIVE_SUBMIT_TOKEN
 
 # run tests with uv
 uv run robot --pythonpath . --exclude gitlab_pipeline --variable remote:"$IS_REMOTE" --outputdir=.. --listener test/keyword_listener.py test/
 
-../../../utils/upload-to-squad.sh -a ../output.xml -u "$SQUAD_UPLOAD_URL"
-uv run --project ../../../utils/ uv run ../../../utils/parse-robot-framework.py -r ../output.xml
+"${UTILS_PATH}"/upload-to-squad.sh -a ../output.xml -u "$SQUAD_UPLOAD_URL"
+uv run --project "${UTILS_PATH}"/ uv run "${UTILS_PATH}"/parse-robot-framework.py -r ../output.xml
 
 exit 0