Updated to official docker ways