Configuration changes to support ubuntu deployment