diff --git a/openwrtbuilder b/openwrtbuilder
index 7bf9e55..c968579 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -379,7 +379,6 @@ extractImageBuilder() {
     debug "${FUNCNAME[0]}"
 
     echo "Extracting Image Builder archive"
-    [[ ! -d "$BUILDDIR" ]] && mkdir -p "$BUILDDIR"
     debug "tar -xf $IB_ARCHIVE -C $BUILDDIR --strip-components 1"
     if ! tar -xf "$IB_ARCHIVE" -C "$BUILDDIR" --strip-components 1; then
         echo "Extraction failed"
@@ -449,8 +448,6 @@ makeImages() {
         fi
     fi
 
-    [[ -d "$BUILDDIR" ]] || mkdir -p "$BUILDDIR"
-
     make image \
         BIN_DIR="$THIS_BINDIR" \
         PROFILE="${P_ARR[profile]}" \
@@ -802,7 +799,7 @@ main() {
 
         # release precedence: user input>profile>env>hardcode
         declare -g RELEASE="${USER_RELEASE:=${P_ARR[release]:=$RELEASE}}"
-        declare -g BUILDDIR="$SRCDIR/$profile/${P_ARR[profile]}-$RELEASE"
+        declare -g BUILDDIR="$SRCDIR/$profile/$RELEASE"
         declare -g FILESYSTEM="${P_ARR[filesystem]:="squashfs"}"
         declare -g THIS_BINDIR="$BINDIR/$profile/${P_ARR[profile]}-$RELEASE"
 
@@ -817,7 +814,7 @@ main() {
         fi
 
         declare -g IB_URL="$url_prefix/$url_filename"
-        declare -g IB_ARCHIVE="$SRCDIR/$url_filename"
+        declare -g IB_ARCHIVE="$BUILDDIR/$url_filename"
         declare -g IB_SHA256_URL="$url_prefix/sha256sums"
         declare -g IB_SHA256_FILE="$IB_ARCHIVE.sha256sums"
         declare -g IB_OUT_SHA256_FILE="$THIS_BINDIR/sha256sums"
@@ -868,6 +865,8 @@ main() {
 
         (( RESET )) && resetProfile
 
+        [[ -d $BUILDDIR ]] || mkdir -p "$BUILDDIR"
+
         (( FROM_SOURCE )) && fromSource
 
         # Acquire and verify Image Builder