diff --git a/packages/docker/Dockerfile.bionic b/packages/docker/Dockerfile.bionic
index 1bbbc47f..8df49225 100644
--- a/packages/docker/Dockerfile.bionic
+++ b/packages/docker/Dockerfile.bionic
@@ -10,28 +10,26 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
 # RUN dpkg --add-architecture i386
 
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
-    # xenial bionic
-    build-essential libcap-dev libssl-dev python-all-dev python-pip \
+    # General build depends for xenial and bionic
+    build-essential libcap-dev libssl-dev python-all-dev python-setuptools \
     # Buildbot
-    libffi-dev python3-all-dev python3-pip \
+    libffi-dev python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
     # Testing environment
     language-pack-en \
-    qtbase5-dev qt5-default tor tox xvfb \
+    python-pip qtbase5-dev qt5-default tor xvfb \
     # stdeb
-    debhelper dh-apparmor dh-python fakeroot python-setuptools python-six wget
+    debhelper dh-apparmor dh-python fakeroot wget \
+    python-msgpack python-qt4 python-six
     # Wine
-    # wget wine-stable winetricks mingw-w64 wine32 wine64
-
-RUN apt-get install -yq python3.8 python3.8-dev python3.8-venv
+    # wine-stable winetricks mingw-w64 wine32 wine64
 
 # cleanup
 RUN rm -rf /var/lib/apt/lists/*
 
 RUN useradd -m -U builder
 
-RUN python3.8 -m pip install wheel
-RUN python3.8 -m pip install --upgrade tox
-RUN python3.8 -m pip install --upgrade virtualenv
+RUN python3.8 -m pip install setuptools wheel
+RUN python3.8 -m pip install --upgrade pip tox virtualenv
 
 # copy sources
 COPY . /home/builder/src