Feature/cfy 872 modify keypair configuration for bootstrap