diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index ef576ff..e94d2a6 100755
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -5,10 +5,8 @@ set -eux
 uname -a
 DESTDIR=/src/releases
 
-for d in armhf-linux aarch64-linux; do
-    mkdir -p $DESTDIR/$d
-    rm -rf $DESTDIR/$d/*
-done
+mkdir -p $DESTDIR/bin
+rm -rf $DESTDIR/bin/*
 
 function build {
 	echo Building for $1 to $3...
@@ -22,6 +20,6 @@ function build {
 	$2 /build/$1/release/bliss-analyser && cp /build/$1/release/bliss-analyser $DESTDIR/$3
 }
 
-build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip armhf/bliss-analyser
-build aarch64-unknown-linux-gnu aarch64-linux-gnu-strip aarch64/bliss-analyser
+build arm-unknown-linux-gnueabihf arm-linux-gnueabihf-strip bin/bliss-analyser-armhf
+build aarch64-unknown-linux-gnu aarch64-linux-gnu-strip bin/bliss-analyser-aarch64
 
diff --git a/download.py b/download.py
index 897ae7b..08ad41f 100755
--- a/download.py
+++ b/download.py
@@ -78,7 +78,7 @@ def make_executable(version):
             os.chdir(td)
             subprocess.call(["chmod", "a+x", "%s/bliss-analyser" % td], shell=False)
             if a == "bliss-analyser-linux-arm":
-                subprocess.call(["chmod", "a+x", "%s/bliss-analyser/armhf/bliss-analyser" % td, "%s/bliss-analyser/aarch64/bliss-analyser" % td], shell=False)
+                subprocess.call(["chmod", "a+x", "%s/bliss-analyser/bin/bliss-analyser-armhf" % td, "%s/bliss-analyser/bin/bliss-analyser-aarch64" % td], shell=False)
             shutil.make_archive("%s/%s-%s" % (cwd, a, version), "zip")
             os.chdir(cwd)
 
diff --git a/scripts/bliss-analyser-arm b/scripts/bliss-analyser-arm
index 9f293f0..1cc02b2 100755
--- a/scripts/bliss-analyser-arm
+++ b/scripts/bliss-analyser-arm
@@ -4,7 +4,7 @@ ARCH=`arch`
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
 
 if [ "$ARCH" = "aarch64" ] ; then
-    $SCRIPT_DIR/aarch64/bliss-analyser $*
+    $SCRIPT_DIR/bin/bliss-analyser-aarch64 $*
 else
-    $SCRIPT_DIR/armhf/bliss-analyser $*
+    $SCRIPT_DIR/bin/bliss-analyser-armhf $*
 fi