diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 18e53fb..f3e956a 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -783,11 +783,11 @@ spcd_step__environment_list_workspace() {
 
 spcd_clean_cache() {
     case "${SPCD_PM}" in
-    "${SPCD_PM_APK}") apk cache purge ;;
-    "${SPCD_PM_APT}") apt-get clean ;;
-    "${SPCD_PM_DNF}") dnf clean all ;;
-    "${SPCD_PM_PACMAN}") pacman --sync --clean --noconfirm ;;
-    "${SPCD_PM_ZYPPER}") zypper clean ;;
+    "${SPCD_PM_APK}") spcd_eval apk cache purge ;;
+    "${SPCD_PM_APT}") spcd_eval apt-get clean ;;
+    "${SPCD_PM_DNF}") spcd_eval dnf clean all ;;
+    "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --clean --noconfirm ;;
+    "${SPCD_PM_ZYPPER}") spcd_eval zypper clean ;;
     *) ;;
     esac
 }
@@ -826,11 +826,11 @@ spcd_https_path() {
 
 spcd_install_package() {
     case "${SPCD_PM}" in
-    "${SPCD_PM_APK}") apk add "${1}" ;;
-    "${SPCD_PM_APT}") apt-get install --assume-yes "${1}" ;;
-    "${SPCD_PM_DNF}") dnf install --assumeyes "${1}" ;;
-    "${SPCD_PM_PACMAN}") pacman --sync --noconfirm "${1}" ;;
-    "${SPCD_PM_ZYPPER}") zypper --non-interactive install "${1}" ;;
+    "${SPCD_PM_APK}") spcd_eval apk add "${1}" ;;
+    "${SPCD_PM_APT}") spcd_eval apt-get install --assume-yes "${1}" ;;
+    "${SPCD_PM_DNF}") spcd_eval dnf install --assumeyes "${1}" ;;
+    "${SPCD_PM_PACMAN}") spcd_eval pacman --sync --noconfirm "${1}" ;;
+    "${SPCD_PM_ZYPPER}") spcd_eval zypper --non-interactive install "${1}" ;;
     *) ;;
     esac
     spcd_clean_cache