Updated keystone setup