Hotfix/set cpk gem