diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh
index a59ef53..266df38 100755
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/zlib.sh"
-    to_df "RUN bash -c 'source /root/zlib.sh && ffbuild_dockerbuild && rm /root/zlib.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/21-libxml2.sh b/scripts.d/21-libxml2.sh
index de527b7..b73c423 100755
--- a/scripts.d/21-libxml2.sh
+++ b/scripts.d/21-libxml2.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/libxml2.sh"
-    to_df "RUN bash -c 'source /root/libxml2.sh && ffbuild_dockerbuild && rm /root/libxml2.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh
index 1ec4c48..d94d34c 100755
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/ft.sh"
-    to_df "RUN bash -c 'source /root/ft.sh && ffbuild_dockerbuild && rm /root/ft.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh
index 7669447..1bbd931 100755
--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/fribidi.sh"
-    to_df "RUN bash -c 'source /root/fribidi.sh && ffbuild_dockerbuild && rm /root/fribidi.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh
index 55b47e3..fd5f698 100755
--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/gmp.sh"
-    to_df "RUN bash -c 'source /root/gmp.sh && ffbuild_dockerbuild && rm /root/gmp.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-libiconv.sh b/scripts.d/25-libiconv.sh
index 8dfe80d..58a1408 100755
--- a/scripts.d/25-libiconv.sh
+++ b/scripts.d/25-libiconv.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/iconv.sh"
-    to_df "RUN bash -c 'source /root/iconv.sh && ffbuild_dockerbuild && rm /root/iconv.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh
index 37cd7da..7570ae2 100755
--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/ogg.sh"
-    to_df "RUN bash -c 'source /root/ogg.sh && ffbuild_dockerbuild && rm /root/ogg.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh
index 353f59c..61b578c 100755
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/fc.sh"
-    to_df "RUN bash -c 'source /root/fc.sh && ffbuild_dockerbuild && rm /root/fc.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh
index b3285a1..c084236 100755
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/harfbuzz.sh"
-    to_df "RUN bash -c 'source /root/harfbuzz.sh && ffbuild_dockerbuild && rm /root/harfbuzz.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/49-libvorbis.sh b/scripts.d/49-libvorbis.sh
index fe89502..f0fa192 100755
--- a/scripts.d/49-libvorbis.sh
+++ b/scripts.d/49-libvorbis.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/vorbis.sh"
-    to_df "RUN bash -c 'source /root/vorbis.sh && ffbuild_dockerbuild && rm /root/vorbis.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh
index cd92ff4..b445fa3 100755
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/amf.sh"
-    to_df "RUN bash -c 'source /root/amf.sh && ffbuild_dockerbuild && rm /root/amf.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh
index a7bf133..4cce970 100755
--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/ffnvcodec.sh"
-    to_df "RUN bash -c 'source /root/ffnvcodec.sh && ffbuild_dockerbuild && rm /root/ffnvcodec.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh
index 7ff4730..b85b9b6 100755
--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/ass.sh"
-    to_df "RUN bash -c 'source /root/ass.sh && ffbuild_dockerbuild && rm /root/ass.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh
index 74634b0..5b932c2 100755
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/lame.sh"
-    to_df "RUN bash -c 'source /root/lame.sh && ffbuild_dockerbuild && rm /root/lame.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh
index 0a9d87a..b0b9a1c 100755
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/opus.sh"
-    to_df "RUN bash -c 'source /root/opus.sh && ffbuild_dockerbuild && rm /root/opus.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh
index 942a823..d904721 100755
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/theora.sh"
-    to_df "RUN bash -c 'source /root/theora.sh && ffbuild_dockerbuild && rm /root/theora.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh
index a31394f..6f87bb6 100755
--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@@ -8,8 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/libvpx.sh"
-    to_df "RUN bash -c 'source /root/libvpx.sh && ffbuild_dockerbuild && rm /root/libvpx.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh
index 6f7037a..0b81b9d 100755
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@@ -7,8 +7,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/sdl.sh"
-    to_df "RUN bash -c 'source /root/sdl.sh && ffbuild_dockerbuild && rm /root/sdl.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh
index 6e3b9d8..a538bd4 100755
--- a/scripts.d/50-x264.sh
+++ b/scripts.d/50-x264.sh
@@ -9,8 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/x264.sh"
-    to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild && rm /root/x264.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh
index db8e034..4675ca2 100755
--- a/scripts.d/50-x265.sh
+++ b/scripts.d/50-x265.sh
@@ -9,8 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /root/x264.sh"
-    to_df "RUN bash -c 'source /root/x264.sh && ffbuild_dockerbuild && rm /root/x264.sh'"
+    to_df "ADD $SELF /stage.sh"
+    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
@@ -21,17 +21,17 @@ ffbuild_dockerbuild() {
     mkdir 8bit 10bit 12bit
 
     cd 12bit
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ../source || return -1
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON ../source || return -1
     make -j$(nproc) || return -1
     cp libx265.a ../8bit/libx265_main12.a
     
     cd ../10bit
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
     make -j$(nproc) || return -1
     cp libx265.a ../8bit/libx265_main10.a
 
     cd ../8bit
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source || return -1
     make -j$(nproc) || return -1
     mv libx265.a libx265_main.a