diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 1846b3a..70bc1a7 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -18,10 +18,14 @@ c = BuildmasterConfig = {}
 # worker name and password must be configured on the worker.
 #c['workers'] = [worker.Worker("worker", "work3rP@ss!")]
 c['workers'] = [
-    worker.DockerLatentWorker('docker', 'work3rP@ss!',
+    worker.DockerLatentWorker('f26', 'work3rP@ss!',
                               docker_host='unix:///var/run/docker.sock',
-                              image='buildbot-worker',
-                              hostconfig={'cap_add': ['SYS_ADMIN']})
+                              image='buildbot-worker:26',
+                              hostconfig={'cap_add': ['SYS_ADMIN']}),
+    worker.DockerLatentWorker('f27', 'work3rP@ss!',
+                              docker_host='unix:///var/run/docker.sock',
+                              image='buildbot-worker:27',
+                              hostconfig={'cap_add': ['SYS_ADMIN']}),
 ]
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
@@ -58,8 +62,11 @@ c['schedulers'].append(schedulers.ForceScheduler(
                             name="Force_QGIS",
                             builderNames=["qgis"]))
 c['schedulers'].append(schedulers.ForceScheduler(
-                            name="Force_QGIS_DNF",
-                            builderNames=["qgis_dnf"]))
+                            name="Force_QGIS_DNF_F26",
+                            builderNames=["qgis_dnf_f26"]))
+c['schedulers'].append(schedulers.ForceScheduler(
+                            name="Force_QGIS_DNF_F27",
+                            builderNames=["qgis_dnf_f27"]))
 
 ####### BUILDERS
 
@@ -83,23 +90,27 @@ qgis_factory.addStep(steps.ShellCommand(command=["copr-cli", "build", "qgis-test
 
 qgis_install_factory = util.BuildFactory()
 qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "copr", "enable", "-y", "dani/qgis-testing"],
-                                   name="[F26] Add COPR"))
+                                   name="Add COPR"))
 qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/sudo", "dnf", "install", "--refresh", "-y", "qgis",
                                                          "python3-qgis", "qgis-server", "qgis-grass"],
-                                   name="[F26] Run DNF"))
-qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/qgis", "--help"],
-                                   name="[F26] Run QGIS"))
+                                   name="Run DNF"))
+qgis_install_factory.addStep(steps.ShellCommand(command=["/usr/bin/qgis", "--help", "|| true"],
+                                   name="Run QGIS"))
 
 # th_factory = util.BuildFactory() # dummy
 
 c['builders'] = []
 c['builders'].append(
     util.BuilderConfig(name="qgis",
-      workernames=["docker"],
+      workernames=["f26"],
       factory=qgis_factory))
 c['builders'].append(
-    util.BuilderConfig(name="qgis_dnf",
-      workernames=["docker"],
+    util.BuilderConfig(name="qgis_dnf_f26",
+      workernames=["f26"],
+      factory=qgis_install_factory))
+c['builders'].append(
+    util.BuilderConfig(name="qgis_dnf_f27",
+      workernames=["f27"],
       factory=qgis_install_factory))
 
 ####### BUILDBOT SERVICES
diff --git a/docker/Dockerfile.f26 b/docker/Dockerfile.f26
index d040ce7..e1721b0 100644
--- a/docker/Dockerfile.f26
+++ b/docker/Dockerfile.f26
@@ -1,5 +1,5 @@
 # vi:syntax=dockerfile
-FROM fedora:26
+FROM registry.fedoraproject.org/fedora:26
 MAINTAINER Daniele Viganò <daniele@vigano.me>
 
 RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
@@ -8,7 +8,7 @@ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
 RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \
                  buildbot-worker
 
-RUN useradd -u 1003 builder && \
+RUN useradd -u 1000 builder && \
     usermod -a -G mock builder
 
 RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers
@@ -19,7 +19,7 @@ WORKDIR ${HOME}
 
 COPY copr $HOME/.config/copr
 
-RUN buildbot-worker create-worker $HOME 172.17.0.1 docker work3rP@ss! && \
+RUN buildbot-worker create-worker $HOME 172.17.0.1 f26 work3rP@ss! && \
     echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \
     echo "Docker running Fedora 26 (x86_64)" > info/host
 
diff --git a/docker/Dockerfile.f27 b/docker/Dockerfile.f27
index d7031df..0dbfa74 100644
--- a/docker/Dockerfile.f27
+++ b/docker/Dockerfile.f27
@@ -1,5 +1,5 @@
 # vi:syntax=dockerfile
-FROM fedora:27
+FROM registry.fedoraproject.org/fedora:27
 MAINTAINER Daniele Viganò <daniele@vigano.me>
 
 RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
@@ -8,7 +8,7 @@ RUN dnf install -y sudo tar bzip2 git python3-pip mock copr-cli && \
 RUN pip3 install https://daniele.vigano.me/files/pypi/Twisted-17.9.0-cp36-cp36m-linux_x86_64.whl \
                  buildbot-worker
 
-RUN useradd -u 1003 builder && \
+RUN useradd -u 1000 builder && \
     usermod -a -G mock builder
 
 RUN echo "builder ALL=(ALL) NOPASSWD: /usr/bin/dnf" >> /etc/sudoers
@@ -19,9 +19,9 @@ WORKDIR ${HOME}
 
 COPY copr $HOME/.config/copr
 
-RUN buildbot-worker create-worker $HOME 172.17.0.1 docker work3rP@ss! && \
+RUN buildbot-worker create-worker $HOME 172.17.0.1 f27 work3rP@ss! && \
     echo "Daniele Viganò <daniel@vigano.me>" > info/admin && \
-    echo "Docker running Fedora 26 (x86_64)" > info/host
+    echo "Docker running Fedora 27 (x86_64)" > info/host
 
-ENTRYPOINT ["/usr/bin/buildbot-worker"]
+ENTRYPOINT ["/usr/local/bin/buildbot-worker"]
 CMD ["start", "--nodaemon"]