diff --git a/plugins/apps/pre-delete b/plugins/apps/pre-delete
index 49f3762bc..a8eb8facb 100755
--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_PATH/common/functions"
 
 APP="$1"; IMAGE_TAG="$2"; IMAGE=$(get_app_image_name $APP $IMAGE_TAG); CACHE_DIR="$DOKKU_ROOT/$APP/cache"
 verify_app_name "$APP"
diff --git a/plugins/enter/commands b/plugins/enter/commands
index e78e4ba13..dd5a592ef 100755
--- a/plugins/enter/commands
+++ b/plugins/enter/commands
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname "$0")/../common/functions"
+source "$PLUGIN_PATH/common/functions"
 
 case "$1" in
   enter)
diff --git a/plugins/tar/commands b/plugins/tar/commands
index f18898e66..cb6575fbd 100755
--- a/plugins/tar/commands
+++ b/plugins/tar/commands
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_PATH/common/functions"
 
 case "$1" in
   tar-from|tar:from)
@@ -14,7 +14,7 @@ case "$1" in
   tar-in|tar:in)
     APP="$2"
     verify_app_name "$2"
-    tee "$DOKKU_ROOT/$APP/src.tar" | wc -c 
+    tee "$DOKKU_ROOT/$APP/src.tar" | wc -c
     pluginhook -p receive-app $APP
     ;;
 
diff --git a/plugins/tar/receive-app b/plugins/tar/receive-app
index 1c9428ccb..0bf09425b 100755
--- a/plugins/tar/receive-app
+++ b/plugins/tar/receive-app
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$(dirname $0)/../common/functions"
+source "$PLUGIN_PATH/common/functions"
 
 APP="$1"; REV="$2"