move more logic to the build... android image is too big