More fixes for docker build / deploy