diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b9b9ba..90ffbb8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
             os: macos-10.15
             os_name: macos
           - target: linux_arm32
-            os: ubuntu-20.04
+            os: ubuntu-18.04
             os_name: linux
           - target: linux_arm64
-            os: ubuntu-20.04
+            os: ubuntu-18.04
             os_name: linux
     env:
       BUILD_TARGET: ${{ matrix.target }}
diff --git a/dist/build.sh b/dist/build.sh
index 5b6a824..d3cc13e 100755
--- a/dist/build.sh
+++ b/dist/build.sh
@@ -144,10 +144,10 @@ if [ ! -d flac-${flac} ]; then
         ${_arch}-configure --disable-ogg --enable-static --disable-cpplibs
         make $make_opts
         popd
-    elif [ "$BUILD_TARGET" == "linux_arm32"]; then
+    elif [ "$BUILD_TARGET" == "linux_arm32" ]; then
         ./configure --disable-ogg --enable-static --host ${_arch}
         make $make_opts
-    elif [ "$BUILD_TARGET" == "linux_arm64"]; then
+    elif [ "$BUILD_TARGET" == "linux_arm64" ]; then
         ./configure --disable-ogg --enable-static --host ${_arch}
         make $make_opts
     else
@@ -185,10 +185,10 @@ if [ ! -d opus-$opus ]; then
             --disable-extra-programs
         make $make_opts
         popd
-    elif [ "$BUILD_TARGET" == "linux_arm32"]; then
+    elif [ "$BUILD_TARGET" == "linux_arm32" ]; then
         ./configure --with-pic --host ${_arch}
         make $make_opts
-    elif [ "$BUILD_TARGET" == "linux_arm64"]; then
+    elif [ "$BUILD_TARGET" == "linux_arm64" ]; then
         ./configure --with-pic --host ${_arch}
         make $make_opts
     else