more conditional updates to keystone