diff --git a/contrib/dokku_client.sh b/contrib/dokku_client.sh
index b74f954a5..a10c73a0c 100755
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -140,7 +140,7 @@ main() {
   esac
 
   [[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
-  [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore ps:startall ps:stopall " == *" $CMD "* ]] && unset APP
+  [[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:restore " == *" $CMD "* ]] && unset APP
   [[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
   [[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
   [[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index 5a278a6b7..c921bae96 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1254,7 +1254,7 @@ verify_app_name "$APP"
 ### `post-stop`
 
 - Description: Can be used to run commands after an app is manually stopped
-- Invoked by: `dokku ps:stop` and `dokku ps:stopall`
+- Invoked by: `dokku ps:stop`
 - Arguments: `$APP`
 - Example:
 
diff --git a/docs/getting-started/uninstalling.md b/docs/getting-started/uninstalling.md
index aa0399a98..480c33f9a 100644
--- a/docs/getting-started/uninstalling.md
+++ b/docs/getting-started/uninstalling.md
@@ -36,7 +36,7 @@ All applications should be stopped, and all docker containers and images deleted
 
 ```shell
 # stop all applications
-dokku ps:stopall
+dokku ps:stop --all
 
 # cleanup containers and images
 dokku cleanup
diff --git a/docs/getting-started/upgrading.md b/docs/getting-started/upgrading.md
index 1aceb7440..b4c2ba8b7 100644
--- a/docs/getting-started/upgrading.md
+++ b/docs/getting-started/upgrading.md
@@ -45,7 +45,9 @@ Why do we recommend stopping all apps?
   may happen in minor or major releases.
 
 ```shell
-# for 0.11.4 and newer versions, use:
+# for 0.22.0 and newer versions, use
+
+# for versions between 0.11.4 and 0.21.4, use
 dokku ps:stopall
 
 # for versions between 0.8.1 and 0.11.3, use
@@ -61,10 +63,10 @@ After upgrading, you should rebuild the applications to take advantage of any
 new buildpacks that were released:
 
 ```shell
-dokku ps:rebuildall
+dokku ps:rebuild --all
 ```
 
-> If you have any applications deployed via the `tags` or `tar` commands, do not run the `ps:rebuildall` command,
+> If you have any applications deployed via the `tags` or `tar` commands, do not run the `ps:rebuild --all` command,
 > and instead trigger `ps:rebuild` manually for each `git`-deployed application:
 >
 > ```
diff --git a/plugins/ps/Makefile b/plugins/ps/Makefile
index 004322380..4dccb2f8d 100644
--- a/plugins/ps/Makefile
+++ b/plugins/ps/Makefile
@@ -1,4 +1,4 @@
-SUBCOMMANDS = subcommands/inspect subcommands/rebuild subcommands/rebuildall subcommands/report subcommands/restart subcommands/restart-policy subcommands/restartall subcommands/restore subcommands/retire subcommands/scale subcommands/set subcommands/start subcommands/startall subcommands/stop subcommands/stopall
+SUBCOMMANDS = subcommands/inspect subcommands/rebuild subcommands/report subcommands/restart subcommands/restart-policy subcommands/restore subcommands/retire subcommands/scale subcommands/set subcommands/start subcommands/stop
 TRIGGERS = triggers/app-restart triggers/install triggers/post-app-clone triggers/post-app-rename triggers/post-create triggers/post-delete triggers/post-stop triggers/pre-deploy triggers/procfile-extract triggers/procfile-get-command triggers/procfile-remove triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = ps