diff --git a/Dockerfile b/Dockerfile
index ceedf9c..444785f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt upgrade -yq && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -yq vim git tmux build-essential \
+    DEBIAN_FRONTEND=noninteractive apt install -yq vim git tmux build-essential \
         python3 python3-dev python3-pip python3-venv python3-tk
 
 COPY . /opt/wally
@@ -22,6 +22,8 @@
     ln -s scripts/wally /usr/bin && \
     chmod a+x /opt/wally/scripts/wally
 
+RUN
+
 ENV PYTHONPATH /opt/cephlib:/opt/xmlbuilder3:/opt/agent:/opt/wally
 
 CMD ["/bin/bash"]
diff --git a/fio_binaries/fio_bionic_x86_64.bz2 b/fio_binaries/fio_bionic_x86_64.bz2
new file mode 100644
index 0000000..b2ae653
--- /dev/null
+++ b/fio_binaries/fio_bionic_x86_64.bz2
Binary files differ
diff --git a/fio_binaries/fio_trusty_x86_64.bz2 b/fio_binaries/fio_trusty_x86_64.bz2
index 0a11441..a90b483 100644
--- a/fio_binaries/fio_trusty_x86_64.bz2
+++ b/fio_binaries/fio_trusty_x86_64.bz2
Binary files differ
diff --git a/fio_binaries/fio_xenial_x86_64.bz2 b/fio_binaries/fio_xenial_x86_64.bz2
index 0a11441..6f0f947 100644
--- a/fio_binaries/fio_xenial_x86_64.bz2
+++ b/fio_binaries/fio_xenial_x86_64.bz2
Binary files differ
diff --git a/fio_binaries/fio_yakkety_x86_64.bz2 b/fio_binaries/fio_yakkety_x86_64.bz2
deleted file mode 100644
index 0a11441..0000000
--- a/fio_binaries/fio_yakkety_x86_64.bz2
+++ /dev/null
Binary files differ
diff --git a/scripts/build_fio_ubuntu.sh b/scripts/build_fio_ubuntu.sh
index 87e6f66..1ce35d5 100644
--- a/scripts/build_fio_ubuntu.sh
+++ b/scripts/build_fio_ubuntu.sh
@@ -1,7 +1,15 @@
-#!/bin/bash
-sudo apt-get update
-sudo apt-get -y install g++ git zlib1g-dev libaio-dev librbd-dev make
+#!/usr/bin/env bash
+set -xe
+
+apt update
+apt -y install g++ git zlib1g-dev libaio-dev librbd-dev make bzip2
+cd /tmp
 git clone https://github.com/axboe/fio.git
 cd fio
 ./configure
-make
+make -j 4
+. /etc/lsb-release
+# VERSION=$(cat /etc/lsb-release | grep DISTRIB_CODENAME | awk -F= '{print $2}')
+chmod a-x fio
+bzip2 -z -9 fio
+mv fio.bz2 "fio_${DISTRIB_CODENAME}_x86_64.bz2"