Use datastore and repo name instead