Merge "Reduce k8s to 11 x 16 GB compute hosts"