diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index f3e956a..664fa64 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -1312,13 +1312,13 @@ spcd_step__ca_update_certificates() {
         "${SPCD_OS_ALMA}" | \
         "${SPCD_OS_FEDORA}" | \
         "${SPCD_OS_ROCKY}")
-        update-ca-trust
+        spcd_eval update-ca-trust
         ;;
     "${SPCD_OS_ALPINE}" | \
         "${SPCD_OS_DEBIAN}" | \
         "${SPCD_OS_OPENSUSE}" | \
         "${SPCD_OS_UBUNTU}")
-        update-ca-certificates
+        spcd_eval update-ca-certificates
         ;;
     *) ;;
     esac
@@ -1340,11 +1340,11 @@ spcd_step__packages_verify_https() {
 spcd_step__packages_upgrade_system() {
     spcd_step "Upgrade system"
     case "${SPCD_PM}" in
-    "${SPCD_PM_APK}") apk upgrade ;;
-    "${SPCD_PM_APT}") apt-get upgrade --assume-yes ;;
-    "${SPCD_PM_DNF}") dnf upgrade --assumeyes ;;
-    "${SPCD_PM_PACMAN}") pacman --sync --sysupgrade --noconfirm ;;
-    "${SPCD_PM_ZYPPER}") zypper --non-interactive update ;;
+    "${SPCD_PM_APK}") spcd_eval apk upgrade ;;
+    "${SPCD_PM_APT}") spcd_eval apt-get upgrade --assume-yes ;;
+    "${SPCD_PM_DNF}") spcd_eval dnf upgrade --assumeyes ;;
+    "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --sysupgrade --noconfirm ;;
+    "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive update ;;
     *) ;;
     esac
 }