Merge "include env for k8s deployment"