diff --git a/arm-env.sh b/arm-env.sh
index fc59b65..b724a84 100644
--- a/arm-env.sh
+++ b/arm-env.sh
@@ -11,8 +11,7 @@
 
 nfs_volume="/arm"
 jenkins_url="https://jenkins.oss.arm.com"
-DOWNLOAD_SERVER_URL="${DOWNLOAD_SERVER_URL:+${DOWNLOAD_SERVER_URL}/tf-a}"
-tfa_downloads="${DOWNLOAD_SERVER_URL:-https://downloads.trustedfirmware.org/tf-a}"
+tfa_downloads="${DOWNLOAD_SERVER_URL:-https://downloads.trustedfirmware.org}/tf-a"
 ci_env="armci"
 
 # Source repositories.