diff --git a/cmd/ursrv/main.go b/cmd/ursrv/main.go
index f3f33e4e2..7a2d3d33f 100644
--- a/cmd/ursrv/main.go
+++ b/cmd/ursrv/main.go
@@ -50,15 +50,21 @@ var (
 	knownDistributions = []distributionMatch{
 		// Maps well known builders to the official distribution method that
 		// they represent
-		{regexp.MustCompile(`android-.*teamcity@build\.syncthing\.net`), "Google Play"},
+
 		{regexp.MustCompile(`teamcity@build\.syncthing\.net`), "GitHub"},
-		{regexp.MustCompile(`deb@build\.syncthing\.net`), "APT"},
-		{regexp.MustCompile(`docker@syncthing\.net`), "Docker Hub"},
 		{regexp.MustCompile(`jenkins@build\.syncthing\.net`), "GitHub"},
-		{regexp.MustCompile(`snap@build\.syncthing\.net`), "Snapcraft"},
+		{regexp.MustCompile(`builder@github\.syncthing\.net`), "GitHub"},
+
+		{regexp.MustCompile(`deb@build\.syncthing\.net`), "APT"},
+		{regexp.MustCompile(`debian@github\.syncthing\.net`), "APT"},
+
+		{regexp.MustCompile(`docker@syncthing\.net`), "Docker Hub"},
+		{regexp.MustCompile(`docker@build.syncthing\.net`), "Docker Hub"},
+		{regexp.MustCompile(`docker@github.syncthing\.net`), "Docker Hub"},
+
+		{regexp.MustCompile(`android-.*teamcity@build\.syncthing\.net`), "Google Play"},
 		{regexp.MustCompile(`android-.*vagrant@basebox-stretch64`), "F-Droid"},
 		{regexp.MustCompile(`builduser@(archlinux|svetlemodry)`), "Arch (3rd party)"},
-		{regexp.MustCompile(`synology@kastelo\.net`), "Synology (Kastelo)"},
 		{regexp.MustCompile(`@debian`), "Debian (3rd party)"},
 		{regexp.MustCompile(`@fedora`), "Fedora (3rd party)"},
 		{regexp.MustCompile(`\bbrew@`), "Homebrew (3rd party)"},
diff --git a/cmd/ursrv/static/index.html b/cmd/ursrv/static/index.html
index ceb8976b6..fce067490 100644
--- a/cmd/ursrv/static/index.html
+++ b/cmd/ursrv/static/index.html
@@ -454,13 +454,13 @@ found in the LICENSE file.
         <table class="table table-striped">
           <thead>
             <tr>
-              <th>Builder</th>
+              <th>Distribution Channel</th>
               <th class="text-right">Devices</th>
               <th class="text-right">Share</th>
             </tr>
           </thead>
           <tbody>
-            {{range .builders}}
+            {{range .distributions}}
             <tr>
               <td>{{.Key}}</td>
               <td class="text-right">{{.Count}}</td>
@@ -475,13 +475,13 @@ found in the LICENSE file.
         <table class="table table-striped">
           <thead>
             <tr>
-              <th>Distribution Channel</th>
+              <th>Builder</th>
               <th class="text-right">Devices</th>
               <th class="text-right">Share</th>
             </tr>
           </thead>
           <tbody>
-            {{range .distributions}}
+            {{range .builders}}
             <tr>
               <td>{{.Key}}</td>
               <td class="text-right">{{.Count}}</td>