Fix issue around duplicate build tag