diff --git a/.github/workflows/validate-build.yaml b/.github/workflows/validate-build.yaml
index 2ec94093..b7a6870a 100644
--- a/.github/workflows/validate-build.yaml
+++ b/.github/workflows/validate-build.yaml
@@ -16,7 +16,7 @@ env:
   DOCKER_BUILDKIT: 1
   PACMAN_CACHE: /tmp/pacman-cache
   WORKSPACE: /workdir
-  BUILD_DIR: /workdir/workdir
+  BUILD_DIR: /workdir/work
   OUTPUT_DIR: /workdir/out
 
 jobs:
diff --git a/pacman.conf b/pacman.conf
index dddb2e94..5276768c 100644
--- a/pacman.conf
+++ b/pacman.conf
@@ -32,8 +32,10 @@ Architecture = auto
 #UseSyslog
 # Color output enabled
 Color
-ILoveCandy    # enable candy output
-ParallelDownloads = 64    # increased for build speed
+# Enable candy output for better visual feedback
+ILoveCandy
+# Increased parallel downloads for build speed
+ParallelDownloads = 64
 # We cannot check disk space from within a chroot environment
 #CheckSpace    # enable disk space checks
 #VerbosePkgLists
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 65f9646a..26f5058d 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -53,10 +53,8 @@ build_iso() {
     # Create a custom hook to disable beeps in various config files
     if [ ! -f "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" ]; then
         log "Creating custom hook to disable beeps..."
-if ! mkdir -p "airootfs/usr/share/libalpm/hooks/" 2>/dev/null; then
-    warn "Failed to create hooks directory, continuing..."
-else
-    cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
+        if ! mkdir -p "airootfs/usr/share/libalpm/hooks/" 2>/dev/null; then
+            warn "Failed to create hooks directory, continuing..."
         else
             cat > "airootfs/usr/share/libalpm/hooks/99-no-beep.hook" << 'EOF'
 [Trigger]
@@ -76,12 +74,8 @@ EOF
     # Add settings to disable terminal bell in bash
     if [ ! -f "airootfs/etc/skel/.bashrc" ]; then
         log "Adding bash configuration to disable terminal bell..."
-if ! mkdir -p "airootfs/etc/skel/" 2>/dev/null; then
-    warn "Failed to create skel directory, continuing..."
-else
-    echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
-    echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
-fi
+        if ! mkdir -p "airootfs/etc/skel/" 2>/dev/null; then
+            warn "Failed to create skel directory, continuing..."
         else
             echo "# Disable terminal bell" > "airootfs/etc/skel/.bashrc"
             echo "bind 'set bell-style none'" >> "airootfs/etc/skel/.bashrc"
@@ -91,11 +85,8 @@ fi
     # Set bell-style none in global inputrc
     if [ ! -f "airootfs/etc/inputrc" ]; then
         log "Setting bell-style none in global inputrc..."
-if ! mkdir -p "airootfs/etc" 2>/dev/null; then
-    warn "Failed to create etc directory, continuing..."
-else
-    echo "set bell-style none" > "airootfs/etc/inputrc"
-fi
+        if ! mkdir -p "airootfs/etc" 2>/dev/null; then
+            warn "Failed to create etc directory, continuing..."
         else
             echo "set bell-style none" > "airootfs/etc/inputrc"
         fi