Merge "Remove KUBECONFIG from env_file"