Add support for QA keypair in addition to Prod