diff --git a/common.d/common.arch.sh b/common.d/common.arch.sh
index da24cf0..ca23356 100644
--- a/common.d/common.arch.sh
+++ b/common.d/common.arch.sh
@@ -30,6 +30,7 @@ fetch_base_system()
         log "Failed to extract rootfs tarball" error
         return 1
     }
+    return 0
 }
 
 prepare_system()
@@ -63,6 +64,7 @@ prepare_system()
     chroot "$rootdir" pacman -Sy archlinux-keyring archlinuxarm-keyring --noconfirm || {
         log "Failed to update pacman keyrings"
     }
+    return 0
 }
 
 setup_zram_generator()
@@ -90,6 +92,7 @@ setup_zram_generator()
         log "Failed to enable zram-generator" ierror
         return 1
     }
+    return 0
 }
 
 install_nabu_packages()
@@ -112,6 +115,7 @@ install_nabu_packages()
         log "Failed to enable services" ierror
         return 1
     }
+    return 0
 }
 
 # shellcheck disable=SC2086
@@ -128,6 +132,7 @@ install_packages()
         log "Failed to install package(s)" ierror
         return 1
     }
+    return 0
 }
 
 finish_system()
@@ -154,5 +159,6 @@ finish_system()
     mv "$rootdir/etc/resolv.conf.1" "$rootdir/etc/resolv.conf"
 
     rm "$rootdir"/.* > /dev/null 2>&1
+    return 0
 }
 
diff --git a/common.d/common.deb.sh b/common.d/common.deb.sh
index ccf1bb1..b647577 100644
--- a/common.d/common.deb.sh
+++ b/common.d/common.deb.sh
@@ -23,6 +23,7 @@ fetch_base_system()
         log "Failed to fetch base system" ierror
         return 1
     }
+    return 0
 }
 
 prepare_system()
@@ -44,6 +45,7 @@ prepare_system()
         log "Failed to update system" ierror
         return 1
     }
+    return 0
 }
 
 setup_zram_generator()
@@ -71,6 +73,7 @@ setup_zram_generator()
         log "Failed to enable zram-generator" ierror
         return 1
     }
+    return 0
 }
 
 install_nabu_packages()
@@ -93,6 +96,7 @@ install_nabu_packages()
         log "Failed to enable services" ierror
         return 1
     }
+    return 0
 }
 
 # shellcheck disable=SC2086
@@ -109,6 +113,7 @@ install_packages()
         log "Failed to install package(s)" ierror
         return 1
     }
+    return 0
 }
 
 finish_system()
@@ -130,5 +135,6 @@ finish_system()
         log "Failed to update runtime linker bindings" ierror
         return 1
     }
+    return 0
 }