fix: separate environmentVariables and secrets condition checks to avoid unintended nesting

fix: separate environmentVariables and secrets condition checks to avoid unintended nesting #471