change to better dockerization