Looks like some config changes are coming soon (https://github.com/pulumi/pulumi/wiki/Roadmap#m27-september-2019) and hopefully some hierarchy changes will be considered too (https://github.com/pulumi/pulumi/issues/2307)