diff --git a/src/BUILD b/src/BUILD
index 487ecc6..5026e34 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -624,7 +624,7 @@
             "--java_tools_zip",
             "src/java_tools_dist_javac" + java_version + ".zip",
             "--gcs_java_tools_dir",
-            "tmp/dist",
+            "tmp/sources",
             "--java_version",
             java_version,
             "--platform",
diff --git a/src/upload_java_tools.sh b/src/upload_java_tools.sh
index 5dc0712..e7dc68c 100755
--- a/src/upload_java_tools.sh
+++ b/src/upload_java_tools.sh
@@ -97,4 +97,4 @@
 
 # Upload the zip that contains the README.md to GCS.
 "$gsutil_cmd" cp "$tmp_zip" \
- "gs://bazel-mirror/bazel_java_tools/${gcs_java_tools_dir}/java_tools_javac${java_version}_${platform}-${commit_hash}-${timestamp}.zip"
+ "gs://bazel-mirror/bazel_java_tools/${gcs_java_tools_dir}/${commit_hash}/java${java_version}/java_tools_javac${java_version}_${platform}-${timestamp}.zip"