diff --git a/utils.sh b/utils.sh
index 50e2265..26ba3ed 100644
--- a/utils.sh
+++ b/utils.sh
@@ -20,15 +20,10 @@
 if [ -n "$host_env" ]; then
   source "$host_env"
 else
-  # Are we running on Arm infrastructure?
-  if echo "$JENKINS_PUBLIC_URL" | grep -q "oss.arm.com"; then
-    source "$ci_root/arm-env.sh"
-  elif echo "$JENKINS_PUBLIC_URL" | grep -q "jenkins.openci"; then
+  if echo "$JENKINS_PUBLIC_URL" | grep -q "staging"; then
+	source "$ci_root/openci-staging-env.sh"
+  else
     source "$ci_root/openci-lts-v2.8-env.sh"
-  elif echo "$JENKINS_PUBLIC_URL" | grep -q "ci.trustedfirmware.org"; then
-    source "$ci_root/openci-lts-v2.8-env.sh"
-  elif echo "$JENKINS_PUBLIC_URL" | grep -q "ci.staging.trustedfirmware.org"; then
-    source "$ci_root/openci-staging-env.sh"
   fi
 fi