diff --git a/docs/development/pluginhooks.md b/docs/development/pluginhooks.md
index 3d2f9e33e..6a81a3310 100644
--- a/docs/development/pluginhooks.md
+++ b/docs/development/pluginhooks.md
@@ -338,7 +338,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 
 CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}"
 
-eval $(dokku config $APP --export)
+eval "$(dokku config $APP --export)"
 DOKKU_DISABLE_DEPLOY="${DOKKU_DISABLE_DEPLOY:-false}"
 
 if [[ "$DOKKU_DISABLE_DEPLOY" = "true" ]]; then
diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands
index 3f3c4eab7..f5eedd538 100755
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -7,7 +7,7 @@ case "$1" in
     APP="$2"; IMAGE="dokku/$APP"; IMAGE_SOURCE_TYPE="$3"; TMP_WORK_DIR="$4"
     CACHE_DIR="$DOKKU_ROOT/$APP/cache"
 
-    eval $(dokku config $APP --export)
+    eval "$(dokku config $APP --export)"
     pushd "$TMP_WORK_DIR" &> /dev/null
 
     case "$IMAGE_SOURCE_TYPE" in
@@ -185,7 +185,7 @@ case "$1" in
     verify_app_name "$2"
     APP="$2";
 
-    eval $(dokku config $APP --export)
+    eval "$(dokku config $APP --export)"
 
     if [[ -s "$DOKKU_ROOT/$APP/URLS" ]]; then
       case "$1" in
diff --git a/plugins/checks/check-deploy b/plugins/checks/check-deploy
index 54c35fcbb..8fc104e23 100755
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -51,8 +51,8 @@ fi
 
 
 # source global and in-app envs to get DOKKU_CHECKS_WAIT and any other necessary vars
-eval $(dokku config --global $APP --export)
-eval $(dokku config $APP --export)
+eval "$(dokku config --global $APP --export)"
+eval "$(dokku config $APP --export)"
 
 # Wait this many seconds (default 5) for server to start before running checks.
 WAIT="${DOKKU_CHECKS_WAIT:-5}"
diff --git a/plugins/config/commands b/plugins/config/commands
index fbb59e99f..e53ba519d 100755
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -91,7 +91,7 @@ case "$1" in
     config_create
 
     [[ "$APP" ]] && DOKKU_CONFIG_TYPE=$APP
-    [[ ! -s $ENV_FILE ]] && is_config_export $@ && exit 0
+    [[ ! -s $ENV_FILE ]] && is_config_export "$@" && exit 0
     [[ ! -s $ENV_FILE ]] && echo "no config vars for $DOKKU_CONFIG_TYPE" && exit 1
 
     VARS=$(grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" $ENV_FILE | cut -d" " -f2-)
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index 7bf87439b..2bfb6773d 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -52,8 +52,8 @@ case "$1" in
     DOKKU_APP_CIDS=($(get_app_container_ids $APP))
     docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
 
-    eval $(dokku config --global $APP --export)
-    eval $(dokku config $APP --export)
+    eval "$(dokku config --global $APP --export)"
+    eval "$(dokku config $APP --export)"
     [[ -f "$APP_NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$APP_NGINX_TEMPLATE" && NGINX_CUSTOM_TEMPLATE="true" && dokku_log_info1 'Overriding default nginx.conf with detected nginx.conf.template'
 
     if [[ ! -n "$NO_VHOST" ]] && [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then