Simplify master container and attempt to fix master port mappings