diff --git a/contrib/release-dokku b/contrib/release-dokku
index f229d1294..09a8649fe 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -6,7 +6,7 @@ readonly ROOT_DIR="$(cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")" && pwd)"
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-release.XXXXXX")"
 readonly DOKKU_GIT_REV="$(git rev-parse HEAD)"
 
-trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
diff --git a/contrib/release-plugin b/contrib/release-plugin
index 7d8cf0598..e0cbc55f2 100755
--- a/contrib/release-plugin
+++ b/contrib/release-plugin
@@ -4,7 +4,7 @@ set -eo pipefail
 
 readonly TMP_WORK_DIR="$(mktemp -d "/tmp/dokku-plugin-release.XXXXXX")"
 
-trap 'rm -rf "$TMP_WORK_DIR" >/dev/null' RETURN INT TERM EXIT
+trap "rm -rf '$TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT
 
 log-info() {
   # shellcheck disable=SC2034
diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions
index 0e356e9be..b67bc850d 100755
--- a/plugins/git/internal-functions
+++ b/plugins/git/internal-functions
@@ -391,7 +391,7 @@ fn-git-clone() {
   fi
 
   dokku_log_info1_quiet "Cloning $APP from $GIT_REMOTE#$GIT_REF"
-  trap 'rm -rf $APP_CLONE_ROOT > /dev/null' RETURN INT TERM EXIT
+  trap "rm -rf '$APP_CLONE_ROOT' > /dev/null" RETURN INT TERM EXIT
 
   is_ref=true
   if GIT_TERMINAL_PROMPT=0 git clone --depth 1 -n --branch "$GIT_REF" "$GIT_REMOTE" "$APP_CLONE_ROOT" 2>/dev/null; then
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index 44165e799..03aea7deb 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -144,7 +144,7 @@ trigger-scheduler-docker-local-scheduler-deploy() {
       }
 
       # run checks first, then post-deploy hooks, which switches proxy traffic
-      trap 'kill_new $cid $PROC_TYPE $CONTAINER_INDEX' INT TERM EXIT
+      trap "kill_new $cid $PROC_TYPE $CONTAINER_INDEX" INT TERM EXIT
       if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "false" ]]; then
         dokku_log_info1 "Attempting pre-flight checks ($PROC_TYPE.$CONTAINER_INDEX)"
         plugn trigger check-deploy "$APP" "$cid" "$PROC_TYPE" "$port" "$ipaddr"