diff --git a/doc/upstream-training/source/slides/docs.rst b/doc/upstream-training/source/slides/docs.rst
index deb89280..d263d0bb 100644
--- a/doc/upstream-training/source/slides/docs.rst
+++ b/doc/upstream-training/source/slides/docs.rst
@@ -6,6 +6,9 @@ OpenStack Documentation
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [operator]
+
 Mission
 =======
 
diff --git a/doc/upstream-training/source/slides/howitsmade-communication.rst b/doc/upstream-training/source/slides/howitsmade-communication.rst
index 86c97797..64b17a5d 100644
--- a/doc/upstream-training/source/slides/howitsmade-communication.rst
+++ b/doc/upstream-training/source/slides/howitsmade-communication.rst
@@ -6,6 +6,9 @@ Online Communication
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [operator]
+
 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 efa431ad..de977024 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]
+   Tags: [management] [operator]
 
 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 7df202d3..4665140d 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]
+   Tags: [management] [operator]
 
 
 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 5d2cabda..a4c88f14 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]
+   Tags: [management] [operator]
 
 What makes a release
 ====================
diff --git a/doc/upstream-training/source/slides/workflow-metrics.rst b/doc/upstream-training/source/slides/workflow-metrics.rst
index 24434321..728201db 100644
--- a/doc/upstream-training/source/slides/workflow-metrics.rst
+++ b/doc/upstream-training/source/slides/workflow-metrics.rst
@@ -6,6 +6,9 @@ Metrics
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [management]
+
 The OpenStack Community in numbers
 ==================================
 
diff --git a/doc/upstream-training/source/slides/workflow-task-tracking.rst b/doc/upstream-training/source/slides/workflow-task-tracking.rst
index 05f7563f..bd2884d1 100644
--- a/doc/upstream-training/source/slides/workflow-task-tracking.rst
+++ b/doc/upstream-training/source/slides/workflow-task-tracking.rst
@@ -6,6 +6,8 @@ Task Tracking
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [operator]
 
 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 94493f6a..dc429358 100644
--- a/doc/upstream-training/source/website/upstream-training-content.rst
+++ b/doc/upstream-training/source/website/upstream-training-content.rst
@@ -57,46 +57,51 @@ Other
 * `Documentation Deep Dive <docs.html>`_
 
 
-+--------------------------+------------+
-|                          | Management |
-+==========================+============+
-| OpenStack as a Software  |     X      |
-+--------------------------+------------+
-| Openstack as a Community |     X      |
-+--------------------------+------------+
-| Environment Setup        |            |
-+--------------------------+------------+
-| Offical Projects         |     X      |
-+--------------------------+------------+
-| Governance               |     X      |
-+--------------------------+------------+
-| Release Cycle            |     X      |
-+--------------------------+------------+
-| Communication            |            |
-+--------------------------+------------+
-| Events                   |     X      |
-+--------------------------+------------+
-| Contribution Process     |            |
-+--------------------------+------------+
-| Registration & Accounts  |            |
-+--------------------------+------------+
-| Task Tracking            |            |
-+--------------------------+------------+
-| Gerrit                   |            |
-+--------------------------+------------+
-| Reviewing                |            |
-+--------------------------+------------+
-| Commit Messages          |            |
-+--------------------------+------------+
-| Project Status & Zuul    |            |
-+--------------------------+------------+
-| Metrics                  |            |
-+--------------------------+------------+
-| Setup & First Patch      |            |
-+--------------------------+------------+
-| Sandbox                  |            |
-+--------------------------+------------+
-| Demo Environment         |            |
-+--------------------------+------------+
-| Documentation            |            |
-+--------------------------+------------+
+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            |            |    ✔     |
++--------------------------+------------+----------+