We are trying to convert all our pipelines to use ORG values. Having this bug will stop using this feature which is very hard to maintain all piepeline templates and manual change when we have EKS cluster migrations