Docker settings improvments