Modify for k8s deployment compatibility