Update build and fix race in eureka
Update build and fix race in eureka