diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 7312f72e17..f9452c85a1 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -47,5 +47,10 @@ if [ "${ONOS_NO_BUCKD:-1}" == "1" ]; then
   export NO_BUCKD=1
 fi
 
+# HACK: Clean-up frequent problem-causers from buck-out
+rm -fr \
+    $ONOS_ROOT/buck-out/bin/lib/.netty \
+    $ONOS_ROOT/buck-out/bin/lib/.KRYO
+
 # Finally, run the Buck command...
 $BUCK "$@"