Fix key derivation
CC-SNAPSHOT for release tag