diff --git a/bin/build b/bin/build
index 6c00572..4cdf1b0 100755
--- a/bin/build
+++ b/bin/build
@@ -108,6 +108,10 @@ build_docker_image "$BUILD_DIR" "$ARCH" "$MIRROR"
 
 print_info "Running AUR package build..."
 
+# Create output directories if they don't exist
+mkdir -p "$BUILD_OUTPUT_DIR"
+mkdir -p "$REPO_DIR"
+
 # Ensure output directories are writable by container user
 make_dir_writable "$BUILD_OUTPUT_DIR"
 make_dir_writable "$REPO_DIR"
diff --git a/build/build.sh b/build/build.sh
index 029dd1a..13732b0 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -145,6 +145,9 @@ build_package() {
   MAKEPKG_FLAGS="-scf --noconfirm"
 
   if makepkg $MAKEPKG_FLAGS; then
+    # Ensure output directory exists
+    mkdir -p "$BUILD_OUTPUT_DIR"
+    
     for pkg_file in *.pkg.tar.*; do
       [[ -f "$pkg_file" ]] && cp "$pkg_file" "$BUILD_OUTPUT_DIR/"
     done