diff --git a/plugins/plugin/subcommands/default b/plugins/plugin/subcommands/default
index 4f1c92e87..8fdd2eaa3 100755
--- a/plugins/plugin/subcommands/default
+++ b/plugins/plugin/subcommands/default
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/plugin/internal-functions"
+source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 dokku_log_warn "Deprecated: Please use plugin:list"
 plugin_list_cmd "$@"
diff --git a/plugins/plugin/subcommands/list b/plugins/plugin/subcommands/list
index ef8a23bfb..bb5e4744d 100755
--- a/plugins/plugin/subcommands/list
+++ b/plugins/plugin/subcommands/list
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/plugin/internal-functions"
+source "$PLUGIN_AVAILABLE_PATH/plugin/internal-functions"
 
 plugin_list_cmd "$@"
diff --git a/plugins/storage/functions b/plugins/storage/functions
index d7fd8f4cf..643fa906c 100755
--- a/plugins/storage/functions
+++ b/plugins/storage/functions
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/docker-options/functions"
+source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
 
 verify_paths() {
   declare desc="verifies storage paths"
diff --git a/plugins/storage/internal-functions b/plugins/storage/internal-functions
index 0c9bf0a64..6224e4966 100755
--- a/plugins/storage/internal-functions
+++ b/plugins/storage/internal-functions
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/docker-options/functions"
-source "$PLUGIN_CORE_AVAILABLE_PATH/storage/functions"
+source "$PLUGIN_AVAILABLE_PATH/docker-options/functions"
+source "$PLUGIN_AVAILABLE_PATH/storage/functions"
 
 storage_help_content_func() {
     declare desc="return storage plugin help content"