Enhancement: WIP for deploy config integration