diff --git a/plugins/plugin/commands b/plugins/plugin/commands
index a5b4dff78..7f4164239 100755
--- a/plugins/plugin/commands
+++ b/plugins/plugin/commands
@@ -7,7 +7,7 @@ case "$1" in
     help_content_func () {
       declare desc="return plugin plugin help content"
       cat<<help_content
-    plugin, Print active plugins
+    plugin:list, Print active plugins
     plugin:install [--core|git-url [--committish tag|branch|commit|--name custom-plugin-name]], Optionally download git-url (with custom tag/committish) & run install trigger for active plugins (or only core ones)
     plugin:install-dependencies [--core], Run install-dependencies trigger for active plugins (or only core ones)
     plugin:update [name [committish]], Optionally update named plugin from git (with custom tag/committish) & run update trigger for active plugins
diff --git a/plugins/plugin/internal-functions b/plugins/plugin/internal-functions
new file mode 100755
index 000000000..3a417402f
--- /dev/null
+++ b/plugins/plugin/internal-functions
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+plugin_list_cmd() {
+  declare desc="lists all plugins"
+  local cmd="plugin"
+
+  plugn version
+  plugn list
+}
diff --git a/plugins/plugin/subcommands/default b/plugins/plugin/subcommands/default
index 61152d7bb..4f1c92e87 100755
--- a/plugins/plugin/subcommands/default
+++ b/plugins/plugin/subcommands/default
@@ -1,11 +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"
 
-plugin_main_cmd() {
-  declare desc="shows details about locally installed plugins"
-  local cmd="plugin"
-  plugn version
-  plugn list
-}
-
-plugin_main_cmd "$@"
+dokku_log_warn "Deprecated: Please use plugin:list"
+plugin_list_cmd "$@"
diff --git a/plugins/plugin/subcommands/list b/plugins/plugin/subcommands/list
new file mode 100755
index 000000000..ef8a23bfb
--- /dev/null
+++ b/plugins/plugin/subcommands/list
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_CORE_AVAILABLE_PATH/plugin/internal-functions"
+
+plugin_list_cmd "$@"