diff --git a/runbot/models/batch.py b/runbot/models/batch.py
index e881e67b..2db6a142 100644
--- a/runbot/models/batch.py
+++ b/runbot/models/batch.py
@@ -117,7 +117,10 @@ class Batch(models.Model):
         Create a build with given params_id if it does not already exists.
         In the case that a very same build already exists that build is returned
         """
-        build = self.env['runbot.build'].search([('params_id', '=', params.id), ('parent_id', '=', False)], limit=1, order='id desc')
+        domain = [('params_id', '=', params.id), ('parent_id', '=', False)]
+        if self.bundle_id.host_id:
+            domain += [('host', '=', self.bundle_id.host_id.name), ('keep_host', '=', True)]
+        build = self.env['runbot.build'].search(domain, limit=1, order='id desc')
         link_type = 'matched'
         if build:
             if build.killable:
diff --git a/runbot/templates/frontend.xml b/runbot/templates/frontend.xml
index 9e5b7556..c6132f1b 100644
--- a/runbot/templates/frontend.xml
+++ b/runbot/templates/frontend.xml
@@ -57,6 +57,9 @@
                         <t t-call="runbot.branch_github_menu"/>
                       </div>
                     </div>
+                    <div t-if="bundle.host_id">
+                      <span class="badge badge-info" t-esc="bundle.host_id.name"></span>
+                    </div>
                   </div>
                   <div class="col-md-9 col-lg-10">
                     <div class="row no-gutters">