Added release keystore and two ways to handle keystore values