Follow-up: Unify logic for expanded_environment_name and expanded_kubernetes_namespace

Follow-up from !161881 (comment 2045962667)