Updated keystore script