diff --git a/doc/tutorials/boards_for_teams/img/frontend_board_empty_v16_0.png b/doc/tutorials/boards_for_teams/img/frontend_board_empty_v16_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6521da25754ce6a886eec6ec9740d8b9b61a7a52
Binary files /dev/null and b/doc/tutorials/boards_for_teams/img/frontend_board_empty_v16_0.png differ
diff --git a/doc/tutorials/boards_for_teams/img/frontend_board_filled_v16_0.png b/doc/tutorials/boards_for_teams/img/frontend_board_filled_v16_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..58f39fdfb10925db4e76ad76f312b3aed17c1d90
Binary files /dev/null and b/doc/tutorials/boards_for_teams/img/frontend_board_filled_v16_0.png differ
diff --git a/doc/tutorials/boards_for_teams/img/ux_board_empty_v16_0.png b/doc/tutorials/boards_for_teams/img/ux_board_empty_v16_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfce3bf0743e151e7f146c2edc18aa1d98996784
Binary files /dev/null and b/doc/tutorials/boards_for_teams/img/ux_board_empty_v16_0.png differ
diff --git a/doc/tutorials/boards_for_teams/img/ux_board_filled_v16_0.png b/doc/tutorials/boards_for_teams/img/ux_board_filled_v16_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7c32fed841f74b1cb9eebf9731a766b889359c8
Binary files /dev/null and b/doc/tutorials/boards_for_teams/img/ux_board_filled_v16_0.png differ
diff --git a/doc/tutorials/boards_for_teams/index.md b/doc/tutorials/boards_for_teams/index.md
index e37bf5a2d31f7ecfb1eca4e15bf4cf0ec32d1c0c..9b34f580e057b0dc78acc1bf151b6ab5b69acf15 100644
--- a/doc/tutorials/boards_for_teams/index.md
+++ b/doc/tutorials/boards_for_teams/index.md
@@ -31,12 +31,9 @@ After you set up everything, the two teams will be able to hand off issues from
 1. A product designer on the UX team:
    1. Checks the `Workflow::Ready for design` list on the **UX workflow** board and decides to work on the profile page redesign.
 
-      <!-- Image: UX board with lists:
-            ~Workflow::Ready for design,
-            ~Workflow::Design
-            ~Workflow::Ready for development -->
+      ![Issue board called "UX workflow" with three columns and three issues](img/ux_board_filled_v16_0.png)
 
-   1. Assigns themselves to the issue.
+   1. Assigns themselves to the **Redesign user profile page** issue.
    1. Drags the issue card to the `Workflow::Design` list. The previous workflow label is automatically removed.
    1. Creates the ✨new designs✨.
    1. [Adds the designs to the issue](../../user/project/issues/design_management.md).
@@ -45,12 +42,9 @@ After you set up everything, the two teams will be able to hand off issues from
 1. A developer on the Frontend team:
    1. Checks the `Workflow::Ready for development` list on the **Frontend workflow** board and chooses an issue to work on.
 
-      <!-- Image: Frontend board, scoped to ~Frontend, with lists:
-            ~Workflow::Ready for development
-            ~Workflow::In development
-            ~Workflow::Complete -->
+      ![Issue board called "Frontend workflow" with three columns and three issues](img/frontend_board_filled_v16_0.png)
 
-   1. Assigns themselves to the issue.
+   1. Assigns themselves to the **Redesign user profile page** issue.
    1. Drags the issue card to the `Workflow::In development` list. The previous workflow label is automatically removed.
    1. Adds the frontend code in a [merge request](../../user/project/merge_requests/index.md).
    1. Adds the `Workflow::Complete` label.
@@ -140,15 +134,14 @@ To create the **UX workflow** issue board:
 1. In the **Title field**, enter `UX workflow`.
 1. Clear the **Show the Open list** and **Show the Closed list** checkboxes.
 1. Select **Create board**. You should see an empty board.
-
-   <!-- Image: empty UX workflow board -->
-
 1. Create a list for the `Workflow::Ready for design` label:
    1. In the upper-left corner of the issue board page, select **Create list**.
    1. In the column that appears, from the **Value** dropdown list, select the `Workflow::Ready for design` label.
    1. Select **Add to board**.
 1. Repeat the previous step for labels `Workflow::Design` and `Workflow::Ready for development`.
 
+![Issue board called "UX workflow" with three columns and no issues](img/ux_board_empty_v16_0.png)
+
 To create the **Frontend workflow** board:
 
 1. In the upper-left corner of the issue board page, select the dropdown list with the current board name.
@@ -164,6 +157,8 @@ To create the **Frontend workflow** board:
    1. Select **Add to board**.
 1. Repeat the previous step for labels `Workflow::In development` and `Workflow::Complete`.
 
+![Issue board called "Frontend workflow" with three columns and no issues](img/frontend_board_empty_v16_0.png)
+
 For now, lists in both your boards should be empty. Next, you'll populate them with some issues.
 
 ## Create issues for features
@@ -193,9 +188,9 @@ Repeat these steps to create a few more issues with the same labels.
 
 You should now see at least one issue there, ready for your product designers to start working on!
 
-<!-- Image: UX workflow board with at least one issue in the `Workflow::Ready for design` list -->
-
 Congratulations! Now your teams can start collaborating on amazing software.
+As a next step, you can try out [the goal workflow](#the-goal-workflow) for yourself using these boards,
+simulating the two teams interacting.
 
 ## Learn more about project management in GitLab
 
diff --git a/doc/tutorials/plan_and_track.md b/doc/tutorials/plan_and_track.md
index 35b552cdaa5e3a3e88c4808108f3a2a92bee7964..0206c462cb29db73f0c8495b05ee8ad1c5215dcc 100644
--- a/doc/tutorials/plan_and_track.md
+++ b/doc/tutorials/plan_and_track.md
@@ -15,4 +15,5 @@ issues, epics, and more.
 | [Create a project from a template](https://gitlab.com/projects/new#create_from_template) | Choose a project template and create a project with files to get you started. | |
 | [Migrate to GitLab](../user/project/import/index.md) | If you are coming to GitLab from another platform, you can import or convert your projects. | |
 | [Run an agile iteration](agile_sprint/index.md) | Use group, projects, and iterations to run an agile development iteration. |
+| [Set up issue boards for team hand-off](boards_for_teams/index.md) | Use issue boards and scoped labels to set up collaboration across many teams. | **{star}** |
 | <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Epics and Issue Boards](https://www.youtube.com/watch?v=I1bFIAQBHB8) | Find out how to use epics and issue boards for project management. | |