Moving keystore definition into settings