diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 6398a1e6..b509bbe1 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -241,28 +241,29 @@ def makeBuilderConfigs(builder_names):
     BCs = []
     for bname in builder_names:
         btype, port, py = bname.split('-')
+        tags = [btype, port, py]
         py = '{}.{}'.format(py[2], py[3])
         if port == 'docs':
             BCs.append(util.BuilderConfig(
-                            name=bname,
+                            name=bname, tags=tags,
                             workernames=_portToWorker(port),
                             factory=makeBuildFactory('win64', py, 'docs')))
             continue
         if port == 'src':
             BCs.append(util.BuilderConfig(
-                            name=bname,
+                            name=bname, tags=tags,
                             workernames=_portToWorker(port),
                             factory=makeBuildFactory('gtk3', py, 'sdist')))
             continue
         if btype == 'build':
             BCs.append(util.BuilderConfig(
-                            name=bname,
+                            name=bname, tags=tags,
                             workernames=_portToWorker(port),
                             factory=makeBuildFactory(port, py)))
             continue
         if btype == 'dist':
             BCs.append(util.BuilderConfig(
-                            name=bname,
+                            name=bname, tags=tags,
                             workernames=_portToWorker(port),
                             factory=makeBuildFactory(port, py, 'dist')))
             continue