Update keystone account setup for new args