diff --git a/steps-guix/helpers.sh b/steps-guix/helpers.sh
index 6e617a80..81639197 100755
--- a/steps-guix/helpers.sh
+++ b/steps-guix/helpers.sh
@@ -181,7 +181,7 @@ build() {
     pkg=$1
     get_revision "${pkg}"
     script_name=${2:-pass$((revision+1)).sh}
-    build_dir=${3:-${pkg}}
+    dirname=${3:-${pkg}}
 
     # shellcheck disable=SC2015
     bin_preseed && return || true # Normal build if preseed fails
@@ -206,9 +206,6 @@ build() {
         # shellcheck source=/dev/null
         . "${build_script}"
     fi
-    if [ -n "${BUILD_DIRNAME+x}" ]; then
-        build_dir="${BUILD_DIRNAME}"
-    fi
 
     echo "${pkg}: getting sources."
     build_stage=src_get
@@ -219,7 +216,7 @@ build() {
     call $build_stage
     unset EXTRA_DISTFILES
 
-    cd "${build_dir}" || (echo "Cannot cd into build/${build_dir}!"; kill $$)
+    cd "${dirname}" || (echo "Cannot cd into build/${dirname}!"; kill $$)
 
     echo "${pkg}: preparing source."
     build_stage=src_prepare
diff --git a/steps-guix/mes-minimal-stripped-0.19-i686-linux/pass1.sh b/steps-guix/mes-minimal-stripped-0.19-i686-linux/pass1.sh
index 7697c298..cdb373cd 100644
--- a/steps-guix/mes-minimal-stripped-0.19-i686-linux/pass1.sh
+++ b/steps-guix/mes-minimal-stripped-0.19-i686-linux/pass1.sh
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_get() { :; }
-src_unpack() { :; }
+src_unpack() {
+    mkdir -p mes-minimal-stripped-0.19-i686-linux
+}
 src_prepare() { :; }
 src_configure() { :; }
-BUILD_DIRNAME=.
 
 src_compile() {
     local stage
diff --git a/steps-guix/mescc-tools-static-stripped-0.5.2-i686-linux/pass1.sh b/steps-guix/mescc-tools-static-stripped-0.5.2-i686-linux/pass1.sh
index 7c16be46..3c0650f2 100644
--- a/steps-guix/mescc-tools-static-stripped-0.5.2-i686-linux/pass1.sh
+++ b/steps-guix/mescc-tools-static-stripped-0.5.2-i686-linux/pass1.sh
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_get() { :; }
-src_unpack() { :; }
+src_unpack() {
+    mkdir -p mescc-tools-static-stripped-0.5.2-i686-linux
+}
 src_prepare() { :; }
 src_configure() { :; }
-BUILD_DIRNAME=.
 
 src_compile() {
     local stage copied
diff --git a/steps-guix/static-binaries-0-i686-linux/pass1.sh b/steps-guix/static-binaries-0-i686-linux/pass1.sh
index f496a243..9334169c 100644
--- a/steps-guix/static-binaries-0-i686-linux/pass1.sh
+++ b/steps-guix/static-binaries-0-i686-linux/pass1.sh
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_get() { :; }
-src_unpack() { :; }
+src_unpack() {
+    mkdir -p static-binaries-0-i686-linux
+}
 src_prepare() { :; }
 src_configure() { :; }
-BUILD_DIRNAME=.
 
 src_compile() {
     local stage dist
diff --git a/steps/helpers.sh b/steps/helpers.sh
index bb0283f5..c4d0bf2c 100755
--- a/steps/helpers.sh
+++ b/steps/helpers.sh
@@ -181,7 +181,7 @@ build() {
     pkg=$1
     get_revision "${pkg}"
     script_name=${2:-pass$((revision+1)).sh}
-    build_dir=${3:-${pkg}}
+    dirname=${3:-${pkg}}
 
     # shellcheck disable=SC2015
     bin_preseed && return || true # Normal build if preseed fails
@@ -206,9 +206,6 @@ build() {
         # shellcheck source=/dev/null
         . "${build_script}"
     fi
-    if [ -n "${BUILD_DIRNAME+x}" ]; then
-        build_dir="${BUILD_DIRNAME}"
-    fi
 
     echo "${pkg}: getting sources."
     build_stage=src_get
@@ -219,7 +216,7 @@ build() {
     call $build_stage
     unset EXTRA_DISTFILES
 
-    cd "${build_dir}" || (echo "Cannot cd into build/${build_dir}!"; kill $$)
+    cd "${dirname}" || (echo "Cannot cd into build/${dirname}!"; kill $$)
 
     echo "${pkg}: preparing source."
     build_stage=src_prepare