diff --git a/projects/go.dev/package.yml b/projects/go.dev/package.yml
index de5fe5a315..efb1e26749 100644
--- a/projects/go.dev/package.yml
+++ b/projects/go.dev/package.yml
@@ -27,24 +27,18 @@ build:
     tea.xyz/gx/cc: c99
     go.dev: '*'
   working-directory: src
-  script: |-
-    # `make.bash` complains about unset GOCACHE and HOME otherwise
-    export GOCACHE="$(pwd)/.gocache"
-
-    ./make.bash
+  script:
+    - ./make.bash
 
     # cleanup
-    cd ..
-    rm src/*.{bash,bat,rc}
-    rm src/Make.dist
-    if test -d "{{prefix}}"; then
-      find "{{prefix}}" -mindepth 1 -delete
-    else
-      mkdir "{{prefix}}"
-    fi
-    mv * "{{prefix}}"
-    find "{{prefix}}" -mindepth 1 -maxdepth 1 -type f -delete -not -name build.sh
+    - rm *.{bash,bat,rc} Make.dist
+    - run: find . -mindepth 1 -delete
+      working-directory: ${{ prefix }}
+    - run: mv api bin doc lib misc pkg src test go.env "{{prefix}}"
+      working-directory: $SRCROOT
   env:
+    # `make.bash` complains about unset GOCACHE and HOME otherwise
+    GOCACHE: "$SRCROOT/.gocache"
     GOROOT_FINAL: ${{ prefix }}
     GOROOT_BOOTSTRAP: ${{ deps.go.dev.prefix }}