diff --git a/doc/upstream-training/source/slides/docs.rst b/doc/upstream-training/source/slides/docs.rst
index cf588a27..f9235edf 100644
--- a/doc/upstream-training/source/slides/docs.rst
+++ b/doc/upstream-training/source/slides/docs.rst
@@ -7,7 +7,7 @@ OpenStack Documentation
    :width: 100%
 
 .. note::
-   Tags: [operator]
+   Tags: [operator] [user]
 
 Mission
 =======
diff --git a/doc/upstream-training/source/slides/howitsmade-communication.rst b/doc/upstream-training/source/slides/howitsmade-communication.rst
index 64b17a5d..f6054b09 100644
--- a/doc/upstream-training/source/slides/howitsmade-communication.rst
+++ b/doc/upstream-training/source/slides/howitsmade-communication.rst
@@ -7,7 +7,7 @@ Online Communication
    :width: 100%
 
 .. note::
-   Tags: [operator]
+   Tags: [operator] [user]
 
 Ways to Communicate in OpenStack
 ================================
diff --git a/doc/upstream-training/source/slides/howitsmade-events.rst b/doc/upstream-training/source/slides/howitsmade-events.rst
index de977024..59888c55 100644
--- a/doc/upstream-training/source/slides/howitsmade-events.rst
+++ b/doc/upstream-training/source/slides/howitsmade-events.rst
@@ -7,7 +7,7 @@ OpenStack Events
    :width: 100%
 
 .. note::
-   Tags: [management] [operator]
+   Tags: [management] [operator] [user]
 
 Regional Events
 ===============
diff --git a/doc/upstream-training/source/slides/howitsmade-official-projects.rst b/doc/upstream-training/source/slides/howitsmade-official-projects.rst
index 4665140d..4e58f647 100644
--- a/doc/upstream-training/source/slides/howitsmade-official-projects.rst
+++ b/doc/upstream-training/source/slides/howitsmade-official-projects.rst
@@ -7,7 +7,7 @@ Official OpenStack projects
    :width: 100%
 
 .. note::
-   Tags: [management] [operator]
+   Tags: [management] [operator] [user]
 
 
 Official OpenStack projects
diff --git a/doc/upstream-training/source/slides/howitsmade-release-cycle.rst b/doc/upstream-training/source/slides/howitsmade-release-cycle.rst
index a4c88f14..1d8b0acb 100644
--- a/doc/upstream-training/source/slides/howitsmade-release-cycle.rst
+++ b/doc/upstream-training/source/slides/howitsmade-release-cycle.rst
@@ -7,7 +7,7 @@ OpenStack Release Cycle
    :width: 100%
 
 .. note::
-   Tags: [management] [operator]
+   Tags: [management] [operator] [user]
 
 What makes a release
 ====================
diff --git a/doc/upstream-training/source/slides/intro-openstack-as-community.rst b/doc/upstream-training/source/slides/intro-openstack-as-community.rst
index a3425d8b..7f45dc63 100644
--- a/doc/upstream-training/source/slides/intro-openstack-as-community.rst
+++ b/doc/upstream-training/source/slides/intro-openstack-as-community.rst
@@ -6,7 +6,7 @@ OpenStack as Community
    :class: fill
    :width: 100%
 .. note::
-   Tags: [management]
+   Tags: [management] [user]
 
 OpenStack as a Community
 ========================
diff --git a/doc/upstream-training/source/slides/intro-openstack-as-software.rst b/doc/upstream-training/source/slides/intro-openstack-as-software.rst
index ddd441ca..7ec97455 100644
--- a/doc/upstream-training/source/slides/intro-openstack-as-software.rst
+++ b/doc/upstream-training/source/slides/intro-openstack-as-software.rst
@@ -6,7 +6,7 @@ OpenStack as Software
    :class: fill
    :width: 100%
 .. note::
-   Tags: [management]
+   Tags: [management] [user]
 
 OpenStack
 =========
diff --git a/doc/upstream-training/source/slides/workflow-task-tracking.rst b/doc/upstream-training/source/slides/workflow-task-tracking.rst
index bd2884d1..dc492e72 100644
--- a/doc/upstream-training/source/slides/workflow-task-tracking.rst
+++ b/doc/upstream-training/source/slides/workflow-task-tracking.rst
@@ -7,7 +7,7 @@ Task Tracking
    :width: 100%
 
 .. note::
-   Tags: [operator]
+   Tags: [operator] [user]
 
 Tracked Items
 =============
diff --git a/doc/upstream-training/source/website/upstream-training-content.rst b/doc/upstream-training/source/website/upstream-training-content.rst
index dc429358..5f585d5b 100644
--- a/doc/upstream-training/source/website/upstream-training-content.rst
+++ b/doc/upstream-training/source/website/upstream-training-content.rst
@@ -62,46 +62,46 @@ Module Tags
 
 The table below tags the modules relevant to different positions.
 
-+--------------------------+------------+----------+
-|                          | Management | Operator |
-+==========================+============+==========+
-| OpenStack as a Software  |     ✔      |          |
-+--------------------------+------------+----------+
-| Openstack as a Community |     ✔      |          |
-+--------------------------+------------+----------+
-| Environment Setup        |            |          |
-+--------------------------+------------+----------+
-| Offical Projects         |     ✔      |     ✔    |
-+--------------------------+------------+----------+
-| Governance               |     ✔      |          |
-+--------------------------+------------+----------+
-| Release Cycle            |     ✔      |     ✔    |
-+--------------------------+------------+----------+
-| Communication            |            |     ✔    |
-+--------------------------+------------+----------+
-| Events                   |     ✔      |     ✔    |
-+--------------------------+------------+----------+
-| Contribution Process     |            |          |
-+--------------------------+------------+----------+
-| Registration & Accounts  |            |          |
-+--------------------------+------------+----------+
-| Task Tracking            |            |     ✔    |
-+--------------------------+------------+----------+
-| Gerrit                   |            |          |
-+--------------------------+------------+----------+
-| Reviewing                |            |          |
-+--------------------------+------------+----------+
-| Commit Messages          |            |          |
-+--------------------------+------------+----------+
-| Project Status & Zuul    |            |          |
-+--------------------------+------------+----------+
-| Metrics                  |     ✔      |          |
-+--------------------------+------------+----------+
-| Setup & First Patch      |            |          |
-+--------------------------+------------+----------+
-| Sandbox                  |            |          |
-+--------------------------+------------+----------+
-| Demo Environment         |            |          |
-+--------------------------+------------+----------+
-| Documentation            |            |    ✔     |
-+--------------------------+------------+----------+
++--------------------------+------------+----------+-------+
+|                          | Management | Operator |  User |
++==========================+============+==========+=======+
+| OpenStack as a Software  |     ✔      |          |   ✔   |
++--------------------------+------------+----------+-------+
+| Openstack as a Community |     ✔      |          |   ✔   |
++--------------------------+------------+----------+-------+
+| Environment Setup        |            |          |       |
++--------------------------+------------+----------+-------+
+| Offical Projects         |     ✔      |     ✔    |   ✔   |
++--------------------------+------------+----------+-------+
+| Governance               |     ✔      |          |       |
++--------------------------+------------+----------+-------+
+| Release Cycle            |     ✔      |     ✔    |   ✔   |
++--------------------------+------------+----------+-------+
+| Communication            |            |     ✔    |    ✔  |
++--------------------------+------------+----------+-------+
+| Events                   |     ✔      |     ✔    |   ✔   |
++--------------------------+------------+----------+-------+
+| Contribution Process     |            |          |       |
++--------------------------+------------+----------+-------+
+| Registration & Accounts  |            |          |       |
++--------------------------+------------+----------+-------+
+| Task Tracking            |            |     ✔    |   ✔   |
++--------------------------+------------+----------+-------+
+| Gerrit                   |            |          |       |
++--------------------------+------------+----------+-------+
+| Reviewing                |            |          |       |
++--------------------------+------------+----------+-------+
+| Commit Messages          |            |          |       |
++--------------------------+------------+----------+-------+
+| Project Status & Zuul    |            |          |       |
++--------------------------+------------+----------+-------+
+| Metrics                  |     ✔      |          |       |
++--------------------------+------------+----------+-------+
+| Setup & First Patch      |            |          |       |
++--------------------------+------------+----------+-------+
+| Sandbox                  |            |          |       |
++--------------------------+------------+----------+-------+
+| Demo Environment         |            |          |       |
++--------------------------+------------+----------+-------+
+| Documentation            |            |    ✔     |   ✔   |
++--------------------------+------------+----------+-------+