Updated docker utilities