diff --git a/src/gentoo_build_publisher/templates/gentoo_build_publisher/binrepos.conf b/src/gentoo_build_publisher/templates/gentoo_build_publisher/binrepos.conf
index 45919e5..e02b441 100644
--- a/src/gentoo_build_publisher/templates/gentoo_build_publisher/binrepos.conf
+++ b/src/gentoo_build_publisher/templates/gentoo_build_publisher/binrepos.conf
@@ -1,3 +1,3 @@
-[binhost]
+[gentoo-build-publisher/{{ machine }}]
 sync-uri = {{ uri }}
 priority = 10
diff --git a/src/gentoo_build_publisher/views/__init__.py b/src/gentoo_build_publisher/views/__init__.py
index 44cd38a..98befec 100644
--- a/src/gentoo_build_publisher/views/__init__.py
+++ b/src/gentoo_build_publisher/views/__init__.py
@@ -119,7 +119,10 @@ def binrepos_dot_conf(request: HttpRequest, machine: str) -> HttpResponse:
     """Create a binrepos.conf entry for the given machine"""
     [*_, dirname] = parse_tag_or_raise_404(machine)
 
-    context = {"uri": request.build_absolute_uri(f"/binpkgs/{dirname}/")}
+    context = {
+        "machine": machine,
+        "uri": request.build_absolute_uri(f"/binpkgs/{dirname}/"),
+    }
     return render(
         request,
         "gentoo_build_publisher/binrepos.conf",