diff --git a/tools/build/onos-prepare-release b/tools/build/onos-prepare-release
index 476e984..9869ac3 100755
--- a/tools/build/onos-prepare-release
+++ b/tools/build/onos-prepare-release
@@ -31,17 +31,14 @@
 git tag -l | grep -q "$ONOS_VERSION\$" &&
   { echo "ERROR: Version already exists"; exit -1; }
 
-cp -R $ONOS_ROOT/tools/build/* $DIR/tools/build/
-cp $ONOS_ROOT/tools/test/bin/onos-archetypes-test $DIR/tools/test/bin/
+# Copy local buck configuration to new tree
+cp $ONOS_ROOT/.buckconfig.local $DIR/
 
 export ONOS_ROOT=$DIR
 # This is a hack to remove symlinks from the ONOS_ROOT path. To be removed when
 # the protobuf buck rules can handle symlinks
 ONOS_ROOT=$(pushd $ONOS_ROOT >/dev/null && pwd -P && popd >/dev/null)
 . $ONOS_ROOT/tools/build/envDefaults
-
-echo "stay away!" >buck-out
-
 exec bash $COMMAND
 
-
+# TODO on exit, print "leaving directory"