diff --git a/docs/src/administration/cli/api-tokens.md b/docs/src/administration/cli/api-tokens.md
index 1340781211..98b271deb1 100644
--- a/docs/src/administration/cli/api-tokens.md
+++ b/docs/src/administration/cli/api-tokens.md
@@ -1,80 +1,121 @@
 ---
-title: "Authenticating with API tokens"
+title: "Authenticate the CLI using an API token"
 sidebarTitle: "API tokens"
 weight: 1
 ---
 
-When setting up CI services and other automation tools,
-you may want to allow them to use the Platform.sh CLI to carry out certain tasks.
-Logging in via a browser isn't an option in these cases.
+You need to set up an API token to authenticate the Platform.sh CLI for any of the following tasks:
+- Running automated tasks on a CI system
+- Running automated tasks directly on app container, for example in a cron job
 
-To run the CLI from such a tool or on an app container, such as via a cron hook, set up an API token to authenticate.
+## Before you begin
 
-## Create a machine user
+You might need the [Platform.sh CLI](../cli/_index.md) to perform certain tasks.
+For example, you need the CLI to do the following:
+- [Check the validity of an API token](#optional-check-the-validity-of-your-api-token). 
+- [Load the CLI SSH certificate for non-CLI commands](#use-the-cli-ssh-certificate-for-non-cli-commands).
 
-For security reasons, we recommend creating a dedicated machine user to run automation tasks,
-such as taking backups and triggering source operations.
-We also strongly recommend creating a unique machine user for each project to be automated.
 
-Like human users, every machine user account needs its own unique email address.
+## 1. Create a machine user
 
-The machine user can be given a very restrictive set of [access permissions](../users.md) limited to just its needed tasks.
-For example, backups require `Admin` access but no SSH key,
-while checking out code from a CI server to run tests on it would require an SSH key but only `Viewer` access.
+To safely run automated tasks, first create machine users.
+Each machine user has its own Platform.sh account associated with a unique email address.
+You can grant them restrictive [access permissions](../users.md) to handle specific automated tasks.
+For security purposes, create a machine user for each type of task you want to automate.
 
-It also shows up in logs and activity streams as a separate entry from human users.
+To create a machine user, follow these steps:
 
-To add the user:
+{{< codetabs >}}
++++
+title=Using the CLI
+file=none
+highlight=false
++++
+
+1. Run the following command using your machine user's email address.
+   ```bash
+   platform user:add  {{< variable "EMAIL_ADDRESS" >}} --role viewer --role development:contributor
+   ```
+   This sets your machine user as a viewer on your project and a contributor on development environments, 
+   with no access to other environment types.
+   Note that you can further [adjust user roles](../users.md#environment-types) depending on your needs and each environment type.
+
+2. In the email invitation, click **Create account**.
+3. To create a Platform.sh account for the machine user, click **Sign up** and follow the instructions.
 
-1. In a terminal, run `platform user:add email@example.com`, replacing the email with the one for your machine user.
-1. (If not within a specific project) choose a project to add the user to.
-1. Press `enter` to make the user a viewer of the entire project.
-1. Assign the user the correct permissions for each environment type.
-   (See the [users documentation](/administration/users.md) for more on access levels.)
-1. Press `enter` to send the invitation.
-1. In your email, click the link in the invitation to accept and then follow the steps to create an account.
+<--->
++++
+title=In the Console
+file=none
+highlight=false
++++
 
-## Get a token
+1. Go to your project and click {{< icon settings >}} **Settings**.
+2. In the **Project Settings** menu, click **Access**.
+3. Click **Add**.
+4. Enter your machine user's email address.
+5. For each [environment type](../users.md#environment-types), assign a role to your machine user and click **Save**.
+
+{{< /codetabs >}}
 
-Once you have a machine user in place, you want to assign an API token to it.
 
-To get an API token:
+## 2. Create a Platform.sh API token
 
-1. As the machine user, open the Console.
+1. Log in to the Console as your machine user.
 2. Open the user menu (your name or profile picture).
 3. Click **My profile**.
-4. Go to the **API Tokens** tab.
-5. Click **Create API Token**.
-   ![The Create API Token button in the Console](/images/management-console/api-tokens-new.png "0.6")
-6. Enter a name to identify your token in the future if you have multiple tokens.
-   ![Creating an API token with the name 'CI tests'](/images/management-console/api-tokens-name.png "0.6")
-7. Click **Copy** to copy the token to your clipboard.
-   Make sure to store the key safely as you can't view the API token again.
-   ![Viewing the API token after it's created](/images/management-console/api-tokens-view.png "0.6")
+4. Go to the **API tokens** tab and click **Create API token**.
+5. Enter a name for your API token and click **Create API token**.
+6. To copy the API token to your clipboard, click **{{< icon copy >}} Copy**.
+   ![Copying the API token after it's created](/images/management-console/copy-api-token.png "0.6")
+   Note that after you close the **API tokens** tab, you can't display the API token again.
+7. Store the API token somewhere secure on your computer.
 
-## Use the API token to authenticate the CLI
+### Optional: check the validity of your API token
 
-Once you have the API token copied, you can use it for your automation tools.
+To check that your API token is valid, run the following command:
 
-### In another CI system
+```bash
+$ platform auth:api-token-login
+```
+
+When prompted, enter your API token.
+You get output similar to this:
+
+```bash
+The API token is valid.
+You are logged in.
+```
+
+For security reasons, rotate your API tokens regularly.
+When an API token is compromised, revoke it immediately.
+
+## 3. Authenticate the Platform.sh CLI using your API token
 
-Set the token in an environment variable named `PLATFORMSH_CLI_TOKEN` on the system where the CLI runs.
-Consult the documentation for your CI system to see how to do that.
+After you create your API token, you can use it to do the following:
 
-{{< note >}}
+-  Allow a CI system to run automated tasks using the Platform.sh CLI.
+-  Run automated tasks on an app container using the Platform.sh CLI, 
+   for example in a cron job. 
 
-If running CLI commands from any automated system,
-we urge you to use the `--no-wait` flag on any commands that may take more than a second or two to avoid blocking the process.
+Note that when running CLI commands in these cases,
+some operations might take time to complete. 
+To avoid waiting for an operation to complete before moving on to the next one, 
+use the `--no-wait` flag.
 
-{{< /note >}}
+### Authenticate in a CI system
 
-### On a Platform.sh environment
+You can allow your CI system to run automated tasks using the Platform.sh CLI.
+To do so, create an environment variable named `PLATFORMSH_CLI_TOKEN` with your API token as its value. 
+For more information, see your CI system's official documentation.
 
-To allow the Platform.sh CLI to be run on an app container, such as via a cron hook, use the API token.
-The CLI can automatically detect the current project and environment.
+To run SSH-based commands that aren't specific to the Platform.sh CLI,
+see how to [load the proper SSH certificate](#use-the-cli-ssh-certificate-for-non-cli-commands).
 
-Set the token as a [top-level environment variable](../../development/variables/_index.md#top-level-environment-variables)
-either using the [CLI](../cli/_index.md) or in the [Console](../web/_index.md):
+### Authenticate in a Platform.sh environment
+
+You can run automated tasks on an app container using the Platform.sh CLI.
+To do so, set your API token as a [top-level environment variable](../../development/variables/_index.md#top-level-environment-variables).
 
 {{< codetabs >}}
 +++
@@ -86,7 +127,7 @@ highlight=false
 Run the following command:
 
 ```bash
-platform variable:create -e {{< variable "ENVIRONMENT_NAME" >}} --level environment --prefix 'env:' --name PLATFORMSH_CLI_TOKEN --sensitive true --value '{{< variable "API_TOKEN" >}}' --json false --enabled true --inheritable false --visible-build true --visible-runtime true
+platform variable:create -e {{< variable "ENVIRONMENT_NAME" >}} --level environment --prefix 'env' --name PLATFORMSH_CLI_TOKEN --sensitive true --value '{{< variable "API_TOKEN" >}}' --inheritable false --visible-build true --no-interaction
 ```
 
 <--->
@@ -132,12 +173,10 @@ hooks:
         echo 'export PATH="'$PLATFORM_APP_DIR'/.linuxbrew/bin:'$PLATFORM_APP_DIR'/.linuxbrew/sbin${PATH+:$PATH}";' >> $PLATFORM_APP_DIR/.environment
 ```
 
-This downloads the CLI to a known directory, `.platformsh/bin`,
-which is added to the PATH at runtime (via the .environment file).
-Because the API token is available, the CLI can now run authenticated commands,
-acting as the user who created the token.
+You can now call the CLI from within the shell on the app container or in a cron job.
 
-You can now call the CLI from within the shell on the app container or via a cron hook.
+To run SSH-based commands that aren't specific to the Platform.sh CLI,
+see how to [load the proper SSH certificate](#use-the-cli-ssh-certificate-for-non-cli-commands).
 
 For caching and other advanced topics,
 copy and use a [prepared script](https://github.com/matthiaz/platformsh-tools/blob/master/install_brew_packages.sh):
@@ -149,23 +188,36 @@ hooks:
         bash install_brew_packages.sh platformsh/tap/platformsh-cli
 ```
 
-To run a cron only on your production environment, check the environment type as in the following example:
+You can set up a cron job on a specific type of environment.
+For example, to run the `update` source operation on your production environment, 
+use the following cron job: 
 
 ```yaml
 crons:
-    backup:
-        spec: 'H 4 * * *'
+    update:
+       spec: '0 0 * * *'
         commands:
             start: |
                 if [ "$PLATFORM_ENVIRONMENT_TYPE" = production ]; then
                    platform backup:create --yes --no-wait
+                   platform source-operation:run update --no-wait --yes
                 fi
 ```
 
-{{< note >}}
+## Use the CLI SSH certificate for non-CLI commands
+
+When you set a `PLATFORMSH_CLI_TOKEN` environment variable,
+the CLI authentication isn't complete until your run a CLI command 
+or load the CLI SSH certificate.
+
+For example, after setting a `PLATFORMSH_CLI_TOKEN` environment variable,
+you might need to run `ssh`, `git`, `rsync`, or `scp` commands before you run any CLI commands.
+
+In this case, to ensure all your commands work, load the CLI SSH certificate first.
+To do so, run the following command:
+
+```bash
+$ platform ssh-cert:load --no-interaction
+```
 
-If you're running CLI commands from any automated system, including a Platform.sh cron task,
-it's best to use the `--no-wait` flag on any commands that may take more than a second or two to avoid blocking the process.
-Failure to do so may result in long deploy times and site downtime.
 
-{{< /note >}}
diff --git a/docs/static/images/management-console/api-tokens-name.png b/docs/static/images/management-console/api-tokens-name.png
deleted file mode 100644
index c39e6685e0..0000000000
Binary files a/docs/static/images/management-console/api-tokens-name.png and /dev/null differ
diff --git a/docs/static/images/management-console/api-tokens-new.png b/docs/static/images/management-console/api-tokens-new.png
deleted file mode 100644
index 4b576a3365..0000000000
Binary files a/docs/static/images/management-console/api-tokens-new.png and /dev/null differ
diff --git a/docs/static/images/management-console/api-tokens-view.png b/docs/static/images/management-console/api-tokens-view.png
deleted file mode 100644
index 3a35c0efef..0000000000
Binary files a/docs/static/images/management-console/api-tokens-view.png and /dev/null differ
diff --git a/docs/static/images/management-console/copy-api-token.png b/docs/static/images/management-console/copy-api-token.png
new file mode 100644
index 0000000000..5bffe6f611
Binary files /dev/null and b/docs/static/images/management-console/copy-api-token.png differ