Add keystore as variable which was causing issue if keyname is not *keystore*