Revert "Revert "CNAME change""

This reverts commit 5313cd157d6aa42c12580b1475bf2970c1b90529.