diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 57013c5..280a80e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,25 +26,38 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y podman
       
+      - name: Build containers
+        run: |
+          echo "Building required containers..."
+          # Build the main container
+          scripts/build-container.sh
+          # Tag it with the additional name used by initramfs script
+          sudo podman tag s390x-archlinux-dev s390x-mkinitcpio-complete
+      
       - name: Build kernel
         run: |
           echo "Building s390x kernel..."
-          scripts/build-all.sh --kernel-only
+          scripts/build-kernel-container.sh
       
       - name: Build initramfs
         run: |
           echo "Building s390x initramfs..."
-          scripts/build-all.sh --initramfs-only
+          scripts/build-initramfs-final.sh
+      
+      - name: Prepare boot files
+        run: |
+          echo "Preparing boot configuration..."
+          scripts/prepare-boot.sh
       
       - name: Prepare release artifacts
         run: |
           mkdir -p release-artifacts
           
           # Copy kernel
-          cp output/vmlinuz-linux release-artifacts/vmlinuz-linux-s390x
+          cp output/vmlinuz-6.6.10-s390x release-artifacts/vmlinuz-linux-s390x
           
           # Copy initramfs
-          cp output/initramfs-linux.img release-artifacts/initramfs-linux-s390x.img
+          cp output/initramfs-6.6.10-s390x.img release-artifacts/initramfs-linux-s390x.img
           
           # Copy boot configuration files
           cp -r boot/* release-artifacts/
diff --git a/scripts/build-all.sh b/scripts/build-all.sh
index e521b1b..fb8157a 100755
--- a/scripts/build-all.sh
+++ b/scripts/build-all.sh
@@ -52,7 +52,7 @@ fi
 
 # Setup toolchain path
 echo -e "${YELLOW}Setting up toolchain path...${NC}"
-source "$PROJECT_ROOT/setup-path.sh"
+source "$PROJECT_ROOT/scripts/setup-path.sh"
 
 # Parse arguments
 BUILD_KERNEL=true
diff --git a/scripts/build-initramfs-final.sh b/scripts/build-initramfs-final.sh
index f00a2c4..bc4cae5 100755
--- a/scripts/build-initramfs-final.sh
+++ b/scripts/build-initramfs-final.sh
@@ -9,7 +9,7 @@ PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 OUTPUT_DIR="$PROJECT_ROOT/output"
 INITRAMFS_NAME="initramfs-${KERNEL_VERSION}-s390x.img"
 MKINITCPIO_SOURCE="$PROJECT_ROOT/mkinitcpio-source"
-MKINITCPIO_REPO="https://gitlab.archlinux.org/archlinux/mkinitcpio.git"
+MKINITCPIO_REPO="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio.git"
 MKINITCPIO_VERSION="v39.2"  # Latest stable version
 
 # Colors
@@ -137,16 +137,13 @@ PATCH_EOF
 
 echo "✓ Applied s390x patches to base install hook"
 
-# Clean any existing build
+# Clean any existing build directory
 rm -rf build
 
 # Build with meson
 echo "Setting up meson build..."
 meson setup build --prefix=/usr --sysconfdir=/etc
 
-echo "Building mkinitcpio..."
-meson compile -C build
-
 echo "Installing mkinitcpio..."
 meson install -C build