diff --git a/build-pkg.sh b/build-pkg.sh
index b58ea08..3bbf04d 100755
--- a/build-pkg.sh
+++ b/build-pkg.sh
@@ -53,6 +53,13 @@ function push-pkg() {
   sudo pacman -Sy || return $?
 }
 
+function build-and-push() {
+  for PKG in "$@"; do
+    build-pkg "${PKG}" || return $?
+  done
+  push-pkg || return $?
+}
+
 function main() {
   # Usage:
   #   Without arguments: Build all packages and watch out for dependencies between them:
@@ -74,20 +81,16 @@ function main() {
       build-pkg "$PKG" || return $?
     done
   else
-    build-pkg xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $?
-    push-pkg || return $?
-
-    build-pkg de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $?
-    push-pkg || return $?
-
-    build-pkg de-p1st-base || return $?
-    push-pkg || return $?
-
-    build-pkg de-p1st-xfce4 || return $?
-    push-pkg || return $?
-
-    build-pkg de-p1st-xfce4-hidpi || return $?
-    push-pkg || return $?
+    # Stage1
+    build-and-push xorg-meta de-p1st-locale de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-htop de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $?
+    # Stage2
+    build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $?
+    # Stage3
+    build-and-push de-p1st-base || return $?
+    # Stage4
+    build-and-push de-p1st-xfce4 || return $?
+    # Stage5
+    build-and-push de-p1st-xfce4-hidpi || return $?
   fi
 
   push-pkg || return $?