diff --git a/testing/mozharness/scripts/b2g_build.py b/testing/mozharness/scripts/b2g_build.py
index ce5dd5bbcb8..26c7cba4eb1 100755
--- a/testing/mozharness/scripts/b2g_build.py
+++ b/testing/mozharness/scripts/b2g_build.py
@@ -740,14 +740,9 @@ class B2GBuild(LocalesMixin, PurgeMixin,
                 if base_pattern in public_upload_patterns:
                     public_files.append(f)
 
-        device_name = self.config['target'].split('-')[0]
-        blobfree_zip = os.path.join(
-                        dirs['work_dir'],
-                        'out',
-                        'target',
-                        'product',
-                        device_name,
-                        device_name + '.blobfree-dist.zip')
+        device_name   = os.path.basename(output_dir)
+        blobfree_dist = device_name + '.blobfree-dist.zip'
+        blobfree_zip  = os.path.join(output_dir, blobfree_dist)
 
         if os.path.exists(blobfree_zip):
             public_files.append(blobfree_zip)
diff --git a/testing/taskcluster/scripts/phone-builder/post-build.sh b/testing/taskcluster/scripts/phone-builder/post-build.sh
index a5a5a895342..9d8fc3eab8d 100755
--- a/testing/taskcluster/scripts/phone-builder/post-build.sh
+++ b/testing/taskcluster/scripts/phone-builder/post-build.sh
@@ -21,8 +21,8 @@ if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
   mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
 fi
 
-if [ -f $WORKSPACE/B2G/upload-public/${DEVICE}.blobfree-dist.zip ]; then
-  mv $WORKSPACE/B2G/upload-public/${DEVICE}.blobfree-dist.zip $HOME/artifacts-public
+if [ -f $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip ]; then
+  mv $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip $HOME/artifacts-public/
 fi
 
 if [ -f $WORKSPACE/B2G/upload-public/$mar_file ]; then