diff --git a/images/base/run_stage.sh b/images/base/run_stage.sh
index 3e19135..04876a2 100755
--- a/images/base/run_stage.sh
+++ b/images/base/run_stage.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -xe
+mkdir /stage
+cd /stage
 source /stage.sh
 ffbuild_dockerbuild
-rm /stage.sh
-rm -rf "$FFBUILD_PREFIX"/bin
+rm -rf /stage /stage.sh "$FFBUILD_PREFIX"/bin
diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh
index 67f2361..85b77ca 100755
--- a/scripts.d/10-mingw.sh
+++ b/scripts.d/10-mingw.sh
@@ -31,9 +31,9 @@ ffbuild_dockerbuild() {
         --enable-idl
     )
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 
     cd ../mingw-w64-libraries/winpthreads
 
@@ -47,12 +47,9 @@ ffbuild_dockerbuild() {
         --enable-static
     )
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../../..
-    rm -rf mingw
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh
index ed18bc2..a0bd22a 100755
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@@ -15,8 +15,8 @@ ffbuild_dockerstage() {
 ffbuild_dockerbuild() {
     mkdir iconv
     cd iconv
-    wget -O iconv.tar.gz "$ICONV_SRC" || return -1
-    tar xaf iconv.tar.gz || return -1
+    wget -O iconv.tar.gz "$ICONV_SRC"
+    tar xaf iconv.tar.gz
     rm iconv.tar.gz
     cd libiconv*
 
@@ -37,12 +37,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf iconv
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index 266df38..afe216c 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -15,10 +15,10 @@ ffbuild_dockerbuild() {
     mkdir zlib
     cd zlib
 
-    wget "$ZLIB_SRC" -O zlib.tar.gz || return -1
-    tar xaf zlib.tar.gz || return -1
+    wget "$ZLIB_SRC" -O zlib.tar.gz
+    tar xaf zlib.tar.gz
     rm zlib.tar.gz
-    cd zlib* || return -1
+    cd zlib*
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -33,12 +33,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf zlib
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/21-libxml2.sh b/scripts.d/21-libxml2.sh
index 28d3b93..b58bb95 100755
--- a/scripts.d/21-libxml2.sh
+++ b/scripts.d/21-libxml2.sh
@@ -33,12 +33,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./autogen.sh "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf libxml2
+    ./autogen.sh "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 2a1e6ba..5769c57 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -15,8 +15,8 @@ ffbuild_dockerstage() {
 ffbuild_dockerbuild() {
     mkdir ft
     cd ft
-    wget -O ft.tar.gz "$FREETYPE_SRC" || return -1
-    tar xaf ft.tar.gz || return -1
+    wget -O ft.tar.gz "$FREETYPE_SRC"
+    tar xaf ft.tar.gz
     rm ft.tar.gz
     cd freetype*
 
@@ -35,12 +35,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf ft
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 98ab5be..c69f463 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -32,14 +32,11 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./autogen.sh "${myconf[@]}" || return -1
-    make || return -1
-    make install || return -1
+    ./autogen.sh "${myconf[@]}"
+    make
+    make install
 
-    sed -i 's/Cflags:/Cflags: -DFRIBIDI_LIB_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/fribidi.pc || return -1
-
-    cd ..
-    rm -rf fribidi
+    sed -i 's/Cflags:/Cflags: -DFRIBIDI_LIB_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/fribidi.pc
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 070b3db..1124954 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -15,12 +15,12 @@ ffbuild_dockerbuild() {
     mkdir gmp
     cd gmp
 
-    wget "$GMP_SRC" -O gmp.tar.xz || return -1
-    tar xaf gmp.tar.xz || return -1
+    wget "$GMP_SRC" -O gmp.tar.xz
+    tar xaf gmp.tar.xz
     rm gmp.tar.xz
-    cd gmp* || return -1
+    cd gmp*
 
-    autoreconf -i || return -1
+    autoreconf -i
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -37,12 +37,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf gmp
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index 9ced836..47d0c77 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$OGG_REPO" "$OGG_COMMIT" ogg
     cd ogg
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -34,10 +34,7 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf ogg
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh
index 0a0bb66..0db996e 100755
--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@@ -41,13 +41,10 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./Configure "${myconf[@]}" || return -1
+    ./Configure "${myconf[@]}"
 
-    sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile || return -1
+    sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile
 
-    make -j$(nproc) || return -1
-    make install_sw || return -1
-
-    cd ..
-    rm -rf openssl
+    make -j$(nproc)
+    make install_sw
 }
diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh
index 66ecf81..952ddc2 100755
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@@ -36,12 +36,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf xz
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 34de6d6..6394756 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -15,10 +15,10 @@ ffbuild_dockerbuild() {
     mkdir fc
     cd fc
 
-    wget "$FONTCONFIG_SRC" -O fc.tar.gz || return -1
-    tar xaf fc.tar.gz || return -1
+    wget "$FONTCONFIG_SRC" -O fc.tar.gz
+    tar xaf fc.tar.gz
     rm fc.tar.gz
-    cd fontconfig* || return -1
+    cd fontconfig*
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -38,12 +38,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf fc
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/40-fftw3.sh b/scripts.d/40-fftw3.sh
index 8e9cf46..3222d87 100755
--- a/scripts.d/40-fftw3.sh
+++ b/scripts.d/40-fftw3.sh
@@ -50,7 +50,4 @@ ffbuild_dockerbuild() {
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf fftw3
 }
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index f3d49f0..f6c2cf8 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -34,10 +34,7 @@ ffbuild_dockerbuild() {
 
     export LIBS="-lpthread"
 
-    ./autogen.sh "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf harfbuzz
+    ./autogen.sh "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh
index 74b541d..79c5d1b 100755
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@@ -24,7 +24,4 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=NO -DBUILD_TESTING=NO -DLIBSAMPLERATE_EXAMPLES=OFF -DLIBSAMPLERATE_INSTALL=YES ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf libsr
 }
diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh
index 18fc570..589505e 100755
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$LIBUDFREAD_REPO" "$LIBUDFREAD_COMMIT" libudfread
     cd libudfread
 
-    ./bootstrap || return -1
+    ./bootstrap
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -39,7 +39,4 @@ ffbuild_dockerbuild() {
     make install
 
     ln -s libudfread.pc "$FFBUILD_PREFIX"/lib/pkgconfig/udfread.pc
-
-    cd ..
-    rm -rf libudfread
 }
diff --git a/scripts.d/45-lv2.sh b/scripts.d/45-lv2.sh
index 7855a2c..d10533a 100755
--- a/scripts.d/45-lv2.sh
+++ b/scripts.d/45-lv2.sh
@@ -26,7 +26,4 @@ ffbuild_dockerbuild() {
     CC="${FFBUILD_CROSS_PREFIX}gcc" CXX="${FFBUILD_CROSS_PREFIX}g++" ./waf configure "${mywaf[@]}"
     ./waf -j$(nproc)
     ./waf install
-
-    cd ..
-    rm -rf lv2
 }
diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh
index ab63ff0..17d7d1e 100755
--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@@ -45,9 +45,6 @@ ffbuild_dockerbuild() {
 
     mkdir -p "$FFBUILD_PREFIX"/lib/pkgconfig
     mv OpenCL.pc "$FFBUILD_PREFIX"/lib/pkgconfig/OpenCL.pc
-
-    cd ../../..
-    rm -rf opencl
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/45-serd.sh b/scripts.d/45-serd.sh
index 890fbcd..075a05b 100755
--- a/scripts.d/45-serd.sh
+++ b/scripts.d/45-serd.sh
@@ -31,7 +31,4 @@ ffbuild_dockerbuild() {
     ./waf install
 
     sed -i 's/Cflags:/Cflags: -DSERD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/serd-0.pc
-
-    cd ..
-    rm -rf serd
 }
diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh
index 5d2e4bf..2739f20 100755
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@@ -41,9 +41,6 @@ ffbuild_dockerbuild() {
     ninja install
 
     sed -i 's/Libs.private:/Libs.private: -lstdc++/; t; $ a Libs.private: -lstdc++' "$FFBUILD_PREFIX"/lib/pkgconfig/libvmaf.pc
-
-    cd ../..
-    rm -rf vmaf
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh
index 502b453..cf3906b 100755
--- a/scripts.d/45-vulkan.sh
+++ b/scripts.d/45-vulkan.sh
@@ -38,9 +38,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_TESTS=OFF ..
     make -j$(nproc)
     make install
-
-    cd ..
-    rm -rf vulkan
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/46-sord.sh b/scripts.d/46-sord.sh
index 47f2477..0b6b17b 100755
--- a/scripts.d/46-sord.sh
+++ b/scripts.d/46-sord.sh
@@ -29,7 +29,4 @@ ffbuild_dockerbuild() {
     ./waf install
 
     sed -i 's/Cflags:/Cflags: -DSORD_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sord-0.pc
-
-    cd ..
-    rm -rf sord
 }
diff --git a/scripts.d/47-sratom.sh b/scripts.d/47-sratom.sh
index d33a6d2..340fb74 100755
--- a/scripts.d/47-sratom.sh
+++ b/scripts.d/47-sratom.sh
@@ -28,7 +28,4 @@ ffbuild_dockerbuild() {
     ./waf install
 
     sed -i 's/Cflags:/Cflags: -DSRATOM_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/sratom-0.pc
-
-    cd ..
-    rm -rf sratom
 }
diff --git a/scripts.d/49-libvorbis.sh b/scripts.d/49-libvorbis.sh
index 5fc3852..a0bc8ef 100755
--- a/scripts.d/49-libvorbis.sh
+++ b/scripts.d/49-libvorbis.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$VORBIS_REPO" "$VORBIS_COMMIT" vorbis
     cd vorbis
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -34,12 +34,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf vorbis
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index 591b12d..83ebb89 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -17,10 +17,7 @@ ffbuild_dockerbuild() {
     cd amf
 
     mkdir -p "$FFBUILD_PREFIX"/include
-    mv amf/public/include "$FFBUILD_PREFIX"/include/AMF || return -1
-
-    cd ..
-    rm -rf amf
+    mv amf/public/include "$FFBUILD_PREFIX"/include/AMF
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh
index f31f82e..0ac6cb9 100755
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@@ -21,14 +21,11 @@ ffbuild_dockerbuild() {
     # Workaround broken build system
     export CFLAGS="$CFLAGS -pthread -I/opt/ffbuild/include/libvmaf"
 
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DENABLE_EXAMPLES=NO -DENABLE_TESTS=NO -DENABLE_TOOLS=NO -DCONFIG_TUNE_VMAF=1 .. || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DENABLE_EXAMPLES=NO -DENABLE_TESTS=NO -DENABLE_TOOLS=NO -DCONFIG_TUNE_VMAF=1 ..
+    make -j$(nproc)
+    make install
 
     echo "Requires.private: libvmaf" >> "$FFBUILD_PREFIX/lib/pkgconfig/aom.pc"
-
-    cd ../..
-    rm -rf aom
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh
index 9eff261..8061338 100755
--- a/scripts.d/50-avisynth.sh
+++ b/scripts.d/50-avisynth.sh
@@ -19,12 +19,9 @@ ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DHEADERS_ONLY=ON .. || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf avisynth
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DHEADERS_ONLY=ON ..
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh
index 6cadc90..b97da75 100755
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@@ -36,9 +36,6 @@ ffbuild_dockerbuild() {
     meson "${myconf[@]}" ..
     ninja -j$(nproc)
     ninja install
-
-    cd ../..
-    rm -rf dav1d
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh
index 1968d51..3731427 100755
--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@@ -36,12 +36,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../../..
-    rm -rf davs2
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index 560fed9..01d209c 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -14,12 +14,9 @@ ffbuild_dockerstage() {
 
 ffbuild_dockerbuild() {
     git-mini-clone "$FFNVCODEC_REPO" "$FFNVCODEC_COMMIT" ffnvcodec
-    pushd ffnvcodec
+    cd ffnvcodec
 
-    make PREFIX="$FFBUILD_PREFIX" install || return -1
-
-    popd
-    rm -rf ffnvcodec
+    make PREFIX="$FFBUILD_PREFIX" install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh
index a88a107..65c751e 100755
--- a/scripts.d/50-glslang.sh
+++ b/scripts.d/50-glslang.sh
@@ -24,9 +24,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_EXTERNAL=ON -DBUILD_TESTING=OFF -DENABLE_CTEST=OFF -DENABLE_HLSL=ON -DENABLE_GLSLANG_BINARIES=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf glslang
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh
index 6e431e3..0366a25 100755
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@@ -22,9 +22,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DENABLE_UBSAN=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf gme
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index ad6f919..d8ef168 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$ASS_REPO" "$ASS_COMMIT" ass
     cd ass
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -34,12 +34,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf ass
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh
index e748271..0942bbb 100755
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$LIBBLURAY_REPO" "$LIBBLURAY_COMMIT" libbluray
     cd libbluray
 
-    ./bootstrap || return -1
+    ./bootstrap
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -44,9 +44,6 @@ ffbuild_dockerbuild() {
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
-
-    cd ..
-    rm -rf libbluray
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index 5b932c2..f299d2d 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -14,8 +14,8 @@ ffbuild_dockerstage() {
 ffbuild_dockerbuild() {
     mkdir lame
     cd lame
-    wget -O lame.tar.gz "$LAME_SRC" || return -1
-    tar xaf lame.tar.gz || return -1
+    wget -O lame.tar.gz "$LAME_SRC"
+    tar xaf lame.tar.gz
     rm lame.tar.gz
     cd lame*
 
@@ -38,12 +38,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf lame
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index dc325b1..7fb4051 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$OPUS_REPO" "$OPUS_COMMIT" opus
     cd opus
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -34,12 +34,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf opus
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index 7c7eb78..46e9ef9 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$THEORA_REPO" "$THEORA_COMMIT" theora
     cd theora
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -39,12 +39,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf theora
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index d59996c..fa62b6c 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -42,12 +42,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf libvpx
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh
index 5f7dd8b..5847f58 100755
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$WEBP_REPO" "$WEBP_COMMIT" webp
     cd webp
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -43,12 +43,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf webp
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-lilv.sh b/scripts.d/50-lilv.sh
index d223c6f..c31cd58 100755
--- a/scripts.d/50-lilv.sh
+++ b/scripts.d/50-lilv.sh
@@ -31,9 +31,6 @@ ffbuild_dockerbuild() {
     ./waf install
 
     sed -i 's/Cflags:/Cflags: -DLILV_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/lilv-0.pc
-
-    cd ..
-    rm -rf lilv
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh
index 94a39c1..4955890 100755
--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$MFX_REPO" "$MFX_COMMIT" mfx
     cd mfx
 
-    autoreconf -i || return -1
+    autoreconf -i
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -34,12 +34,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf mfx
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh
index d8da138..91b1d57 100755
--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@@ -43,9 +43,6 @@ ffbuild_dockerbuild() {
     ./configure "${myconf[@]}"
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf opencore
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh
index 4c7bdfa..dc89bcf 100755
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@@ -21,9 +21,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_PKGCONFIG_FILES=ON -DBUILD_CODEC=OFF -DWITH_ASTYLE=OFF -DBUILD_TESTING=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf openjpeg
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 2c05532..40c1ead 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -23,9 +23,6 @@ ffbuild_dockerbuild() {
         --library-type=staticlib \
         --crt-static \
         --release
-
-    cd ..
-    rm -rf rav1e
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh
index 7aa14cd..d143dcd 100755
--- a/scripts.d/50-rubberband.sh
+++ b/scripts.d/50-rubberband.sh
@@ -47,9 +47,6 @@ ffbuild_dockerbuild() {
 
     # Fix static linking
     echo "Requires.private: fftw3 samplerate" >> "$FFBUILD_PREFIX"/lib/pkgconfig/rubberband.pc
-
-    cd ../../..
-    rm -rf rubberband
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index b417bc1..1cbd674 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -15,12 +15,12 @@ ffbuild_dockerbuild() {
     mkdir sdl
     cd sdl
 
-    wget "$SDL_SRC" -O SDL.tar.gz || return -1
-    tar xaf SDL.tar.gz || return -1
+    wget "$SDL_SRC" -O SDL.tar.gz
+    tar xaf SDL.tar.gz
     rm SDL.tar.gz
-    cd SDL* || return -1
+    cd SDL*
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -37,12 +37,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf sdl
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh
index 9da4a21..19d1db6 100755
--- a/scripts.d/50-soxr.sh
+++ b/scripts.d/50-soxr.sh
@@ -22,9 +22,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf soxr
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh
index 828833d..3ed3b3e 100755
--- a/scripts.d/50-srt.sh
+++ b/scripts.d/50-srt.sh
@@ -18,12 +18,9 @@ ffbuild_dockerbuild() {
 
     mkdir build && cd build
 
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF .. || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../..
-    rm -rf srt
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DENABLE_ENCRYPTION=ON -DENABLE_APPS=OFF ..
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 91eb2d6..45d266f 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -24,9 +24,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DBUILD_APPS=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf svtav1
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh
index 7d05621..8ae383e 100755
--- a/scripts.d/50-twolame.sh
+++ b/scripts.d/50-twolame.sh
@@ -14,8 +14,8 @@ ffbuild_dockerstage() {
 ffbuild_dockerbuild() {
     mkdir twolame
     cd twolame
-    wget -O twolame.tar.gz "$TWOLAME_SRC" || return -1
-    tar xaf twolame.tar.gz || return -1
+    wget -O twolame.tar.gz "$TWOLAME_SRC"
+    tar xaf twolame.tar.gz
     rm twolame.tar.gz
     cd twolame*
 
@@ -36,14 +36,11 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 
-    sed -i 's/Cflags:/Cflags: -DLIBTWOLAME_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/twolame.pc || return -1
-
-    cd ../..
-    rm -rf twolame
+    sed -i 's/Cflags:/Cflags: -DLIBTWOLAME_STATIC/' "$FFBUILD_PREFIX"/lib/pkgconfig/twolame.pc
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index e552fc7..9a64017 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -25,9 +25,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=NO ../..
     make -j$(nproc)
     make install
-
-    cd ../../..
-    rm -rf uavs3d
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh
index 0b5ddb1..1eb625a 100755
--- a/scripts.d/50-vidstab.sh
+++ b/scripts.d/50-vidstab.sh
@@ -23,9 +23,6 @@ ffbuild_dockerbuild() {
     cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF ..
     make -j$(nproc)
     make install
-
-    cd ../..
-    rm -rf vidstab
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index b0717ad..cf25a0d 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -15,7 +15,7 @@ ffbuild_dockerstage() {
 
 ffbuild_dockerbuild() {
     git-mini-clone "$X264_REPO" "$X264_COMMIT" x264
-    pushd x264
+    cd x264
 
     local myconf=(
         --disable-cli
@@ -36,12 +36,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    popd
-    rm -rf x264
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index 34052d5..36c933f 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -57,9 +57,6 @@ EOF
     fi
 
     make install
-
-    cd ../..
-    rm -rf x265
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh
index 64b3616..a3b01d8 100755
--- a/scripts.d/50-xavs2.sh
+++ b/scripts.d/50-xavs2.sh
@@ -43,12 +43,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ../../..
-    rm -rf xavs2
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh
index 1d17e13..e8a2728 100755
--- a/scripts.d/50-xvid.sh
+++ b/scripts.d/50-xvid.sh
@@ -15,8 +15,8 @@ ffbuild_dockerstage() {
 ffbuild_dockerbuild() {
     mkdir xvid
     cd xvid
-    wget -O xvid.tar.gz "$XVID_SRC" || return -1
-    tar xaf xvid.tar.gz || return -1
+    wget -O xvid.tar.gz "$XVID_SRC"
+    tar xaf xvid.tar.gz
     rm xvid.tar.gz
     cd xvid*
 
@@ -35,15 +35,12 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 
     rm "$FFBUILD_PREFIX"/{bin/xvidcore.dll,lib/xvidcore.dll.a}
     mv "$FFBUILD_PREFIX"/lib/{,lib}xvidcore.a
-
-    cd ../../../..
-    rm -rf xvid
 }
 
 ffbuild_configure() {
diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh
index 8a87962..f413cc2 100755
--- a/scripts.d/50-zimg.sh
+++ b/scripts.d/50-zimg.sh
@@ -16,7 +16,7 @@ ffbuild_dockerbuild() {
     git-mini-clone "$ZIMG_REPO" "$ZIMG_COMMIT" zimg
     cd zimg
 
-    ./autogen.sh || return -1
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"
@@ -33,12 +33,9 @@ ffbuild_dockerbuild() {
         return -1
     fi
 
-    ./configure "${myconf[@]}" || return -1
-    make -j$(nproc) || return -1
-    make install || return -1
-
-    cd ..
-    rm -rf zimg
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
 }
 
 ffbuild_configure() {