Target only org automatically
[#59205040]