Reverting keystore change as it is still failing in Jenkins