Sync with pod-template-rake