Move even more stuff into dockerversion

Also, use it in all the places. :)