Modify Docker to work with upstream changes
Rename deprecated configuration options