Move oxygen target here instead of build