Overall Docker Redesign