move datastore setup to broker subset