Feature/b fd rebuild repo