XD-2214 (cont) Use the keystore password instead of the hardcoded value