diff --git a/server/dev/build b/server/dev/build
index c67c5acb..faddfc0b 100755
--- a/server/dev/build
+++ b/server/dev/build
@@ -11,7 +11,8 @@ GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
 echo "Building server image"
 docker build -t neko_server --build-arg "GIT_COMMIT=$GIT_COMMIT" --build-arg "GIT_BRANCH=$GIT_BRANCH" -f ../Dockerfile ..
 
-BUILD_IMAGE=neko_server FLAVOUR=$1 ../../build
+echo "Building base image"
+../../build -y -b neko_server -t base -f "$1"
 
 echo "Building app image"
 docker build -t neko_server:app --build-arg "BASE_IMAGE=neko_server:base" -f ./runtime/Dockerfile ./runtime
diff --git a/server/dev/runtime/Dockerfile b/server/dev/runtime/Dockerfile
index 4f17e645..438acb2f 100644
--- a/server/dev/runtime/Dockerfile
+++ b/server/dev/runtime/Dockerfile
@@ -8,13 +8,13 @@ ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lan
 RUN set -eux; apt-get update; \
     apt-get install -y --no-install-recommends \
         dbus-x11 xfce4 xfce4-terminal sudo \
-        xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
+        xz-utils libgtk-3-0 libdbus-glib-1-2; \
     #
     # fetch latest firefox release
-    wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
+    wget -O /tmp/firefox-setup.tar.xz "${SRC_URL}"; \
     mkdir /usr/lib/firefox; \
-    tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \
-    rm -f /tmp/firefox-setup.tar.bz2; \
+    tar -xvf /tmp/firefox-setup.tar.xz -C /usr/lib; \
+    rm -f /tmp/firefox-setup.tar.xz; \
     ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
     #
     # add user to sudoers
@@ -22,7 +22,7 @@ RUN set -eux; apt-get update; \
     echo "neko:neko" | chpasswd; \
     echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
     # clean up
-    apt-get --purge autoremove -y xz-utils bzip2; \
+    apt-get --purge autoremove -y xz-utils; \
     apt-get clean -y; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/*