diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py
index bf60e35..0cab7b9 100644
--- a/lib/worker_multibuild.py
+++ b/lib/worker_multibuild.py
@@ -43,6 +43,8 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-
     python3-pip dumb-init curl openssh-client wget
 
 RUN pip3 install 'buildbot-worker==2.6.0'
+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
@@ -88,6 +90,8 @@ RUN apt-get update -y && apt-get install -yq --no-install-suggests --no-install-
     python-setuptools python-psutil libssl-dev python-dev libgmp-dev python-virtualenv
 
 RUN pip3 install 'buildbot-worker==2.6.0'
+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