diff --git a/ci/scripts/build-grootfs.sh b/ci/scripts/build-grootfs.sh
index daa98a613..bda2429ad 100755
--- a/ci/scripts/build-grootfs.sh
+++ b/ci/scripts/build-grootfs.sh
@@ -3,7 +3,7 @@ set -e -x
 
 
 OUTPUT_PATH=$PWD/build-grootfs
-GOPATH=$GOPATH:$PWD
+GOPATH=$PWD/grootfs-release-master
 VERSION=$(cat grootfs-release-version/number)
 
 cd grootfs-release-master/src/code.cloudfoundry.org/grootfs
@@ -19,7 +19,7 @@ git add main.go
 git commit -m "Bump version to ${VERSION}"
 
 make
-tar -czf grootfs.tgz grootfs
-tar -czf drax.tgz drax
+tar -czf grootfs-${VERSION}.tgz grootfs
+tar -czf drax-${VERSION}.tgz drax
 
 cp -r . $OUTPUT_PATH
diff --git a/ci/tasks/build-grootfs.yml b/ci/tasks/build-grootfs.yml
index ba577fa24..14d5f41d3 100644
--- a/ci/tasks/build-grootfs.yml
+++ b/ci/tasks/build-grootfs.yml
@@ -15,4 +15,4 @@ outputs:
 - name: build-grootfs
 
 run:
-  path: src/code.cloudfoundry.org/grootfs/ci/scripts/build-grootfs.sh
+  path: grootfs-release-master/src/code.cloudfoundry.org/grootfs/ci/scripts/build-grootfs.sh