Backport "Fix environment scope regex" to CE

The following discussion from !3641 (merged) should be addressed:

• @dosuken123 started a discussion:

  This will be backported after this MR merged