diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py
index bf60e35..cf635ee 100644
--- a/lib/worker_multibuild.py
+++ b/lib/worker_multibuild.py
@@ -40,9 +40,11 @@ dockerfile_extra_contents['bionic'] = """
 # Buildbot
 RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
     git subversion python3-dev libffi-dev python3-setuptools \
-    python3-pip dumb-init curl openssh-client wget
-
-RUN pip3 install 'buildbot-worker==2.6.0'
+    python3-pip dumb-init curl openssh-client wget python3-wheel \
+    pkg-config
+RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust
+RUN groupadd buildbot
+RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot
 
 # buildbot entrypoint
 RUN wget -O /usr/local/bin/buildbot_entrypoint.sh https://git.bitmessage.org/Bitmessage/buildbot-scripts/raw/branch/master/docker/bionic/entrypoint.sh
@@ -85,9 +87,12 @@ dockerfile_extra_contents['xenial'] = """
 RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-recommends \
     git subversion python3-dev libffi-dev python3-setuptools \
     python3-pip curl openssh-client wget \
-    python-setuptools python-psutil libssl-dev python-dev libgmp-dev python-virtualenv
+    python-setuptools python-psutil libssl-dev python-dev libgmp-dev \
+    python-virtualenv python3-wheel pkg-config
 
-RUN pip3 install 'buildbot-worker==2.6.0'
+RUN pip3 install buildbot-worker pyOpenSSL setuptools_rust
+RUN groupadd buildbot
+RUN useradd -d /var/lib/buildbot -m -g buildbot buildbot
 
 # dumb-init
 RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_amd64.deb