diff --git a/lava_helper/lava_create_jobs.py b/lava_helper/lava_create_jobs.py
index 71baa3f..2e803c3 100755
--- a/lava_helper/lava_create_jobs.py
+++ b/lava_helper/lava_create_jobs.py
@@ -53,13 +53,7 @@
     if params["device_type"] == "fvp":
         platform = "fvp"
 
-    # FIXME: temporary workaround until we switch all platforms artifacts
-    #        to use the same location (new build system)
-    url = "{}/artifact/trusted-firmware-m/build".format(artifact_store_url.rstrip("/"))
-    if platform.lower().startswith("musca"):
-        url = "{}/bin/{}".format(url, filename)
-    else:
-        url = "{}/install/outputs/{}/{}".format(url, platform, filename)
+    url = "{}/artifact/trusted-firmware-m/build/bin/{}".format(artifact_store_url.rstrip("/"), filename)
     return url