Eliminated direct references to dockerhub images