diff --git a/doc/upstream-training/source/slides/code-devstack.rst b/doc/upstream-training/source/slides/code-devstack.rst
index 47f8c567..6e279a66 100644
--- a/doc/upstream-training/source/slides/code-devstack.rst
+++ b/doc/upstream-training/source/slides/code-devstack.rst
@@ -6,6 +6,9 @@ Demo environment
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
+
 DevStack
 ========
 
diff --git a/doc/upstream-training/source/slides/development-environment-setup.rst b/doc/upstream-training/source/slides/development-environment-setup.rst
index 817841db..d739e3a2 100644
--- a/doc/upstream-training/source/slides/development-environment-setup.rst
+++ b/doc/upstream-training/source/slides/development-environment-setup.rst
@@ -6,6 +6,9 @@ Setup the Development Environment
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
+
 Summary
 =======
 
diff --git a/doc/upstream-training/source/slides/docs.rst b/doc/upstream-training/source/slides/docs.rst
index f9235edf..1dba3e45 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] [user]
+   Tags: [operator] [user] [new_dev] [dev]
 
 Mission
 =======
diff --git a/doc/upstream-training/source/slides/howitsmade-communication.rst b/doc/upstream-training/source/slides/howitsmade-communication.rst
index f6054b09..4a93e45b 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] [user]
+   Tags: [operator] [user] [new_dev] [dev]
 
 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 59888c55..ceb800cd 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] [user]
+   Tags: [management] [operator] [user] [new_dev] [dev]
 
 Regional Events
 ===============
diff --git a/doc/upstream-training/source/slides/howitsmade-governance.rst b/doc/upstream-training/source/slides/howitsmade-governance.rst
index e4cb1e98..9f7cf8fc 100644
--- a/doc/upstream-training/source/slides/howitsmade-governance.rst
+++ b/doc/upstream-training/source/slides/howitsmade-governance.rst
@@ -7,7 +7,7 @@ OpenStack Governance
    :width: 100%
 
 .. note::
-   Tags: [management]
+   Tags: [management] [new_dev] [dev]
 
 OpenStack Foundation
 ====================
diff --git a/doc/upstream-training/source/slides/howitsmade-official-projects.rst b/doc/upstream-training/source/slides/howitsmade-official-projects.rst
index 4e58f647..bdf0132e 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] [user]
+   Tags: [management] [operator] [user] [new_dev] [dev]
 
 
 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 1d8b0acb..4b454d74 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] [user]
+   Tags: [management] [operator] [user] [new_dev] [dev]
 
 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 7f45dc63..1d549918 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] [user]
+   Tags: [management] [user] [new_dev]
 
 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 7ec97455..8480df52 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] [user]
+   Tags: [management] [user] [new_dev]
 
 OpenStack
 =========
diff --git a/doc/upstream-training/source/slides/workflow-commit-message.rst b/doc/upstream-training/source/slides/workflow-commit-message.rst
index 76c63af0..8d66c5cf 100644
--- a/doc/upstream-training/source/slides/workflow-commit-message.rst
+++ b/doc/upstream-training/source/slides/workflow-commit-message.rst
@@ -6,6 +6,9 @@ Commit Messages
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev] [dev]
+
 Commit Messages
 ===============
 
diff --git a/doc/upstream-training/source/slides/workflow-gerrit.rst b/doc/upstream-training/source/slides/workflow-gerrit.rst
index ea84adb3..0e6a5ed4 100644
--- a/doc/upstream-training/source/slides/workflow-gerrit.rst
+++ b/doc/upstream-training/source/slides/workflow-gerrit.rst
@@ -6,6 +6,9 @@ review.openstack.org
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev] [dev]
+
 review.openstack.org
 ====================
 
diff --git a/doc/upstream-training/source/slides/workflow-metrics.rst b/doc/upstream-training/source/slides/workflow-metrics.rst
index 728201db..ae41339e 100644
--- a/doc/upstream-training/source/slides/workflow-metrics.rst
+++ b/doc/upstream-training/source/slides/workflow-metrics.rst
@@ -7,7 +7,7 @@ Metrics
    :width: 100%
 
 .. note::
-   Tags: [management]
+   Tags: [management] [new_dev] [dev]
 
 The OpenStack Community in numbers
 ==================================
diff --git a/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst b/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst
index cb212c0e..206b74e0 100644
--- a/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst
+++ b/doc/upstream-training/source/slides/workflow-project-status-and-zuul.rst
@@ -6,6 +6,9 @@ OpenStack Project Status and Zuul
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev] [dev]
+
 OpenStack Infrastructure and Project Status
 ===========================================
 - `http://status.openstack.org <http://status.openstack.org>`_
diff --git a/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst b/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
index e4fe207d..c128d901 100644
--- a/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
+++ b/doc/upstream-training/source/slides/workflow-reg-and-accounts.rst
@@ -6,6 +6,8 @@ Registration and Accounts
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
 
 Accounts
 ========
diff --git a/doc/upstream-training/source/slides/workflow-reviewing.rst b/doc/upstream-training/source/slides/workflow-reviewing.rst
index 8b4c20fc..9eefa21a 100644
--- a/doc/upstream-training/source/slides/workflow-reviewing.rst
+++ b/doc/upstream-training/source/slides/workflow-reviewing.rst
@@ -6,6 +6,9 @@ Reviewing
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev] [dev]
+
 Review unified
 ==============
 
diff --git a/doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst b/doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst
index 72bbc85d..93037616 100644
--- a/doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst
+++ b/doc/upstream-training/source/slides/workflow-setup-and-first-patch.rst
@@ -6,6 +6,9 @@ Setup & First Patch
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
+
 git config
 ==========
 
diff --git a/doc/upstream-training/source/slides/workflow-task-tracking.rst b/doc/upstream-training/source/slides/workflow-task-tracking.rst
index dc492e72..58027f8f 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] [user]
+   Tags: [operator] [user] [new_dev] [dev]
 
 Tracked Items
 =============
diff --git a/doc/upstream-training/source/slides/workflow-training-contribution-process.rst b/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
index 39e35d60..9e35ea1b 100644
--- a/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
+++ b/doc/upstream-training/source/slides/workflow-training-contribution-process.rst
@@ -6,6 +6,9 @@ Overview of the contribution process
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
+
 Getting to Know Your Project
 ============================
 
diff --git a/doc/upstream-training/source/slides/workflow-using-sandbox.rst b/doc/upstream-training/source/slides/workflow-using-sandbox.rst
index a9a4cbf4..53045e60 100644
--- a/doc/upstream-training/source/slides/workflow-using-sandbox.rst
+++ b/doc/upstream-training/source/slides/workflow-using-sandbox.rst
@@ -6,6 +6,9 @@ Using Sandbox for Practice
    :class: fill
    :width: 100%
 
+.. note::
+   Tags: [new_dev]
+
 Sandbox repository
 ==================
 
diff --git a/doc/upstream-training/source/website/upstream-training-content.rst b/doc/upstream-training/source/website/upstream-training-content.rst
index 5f585d5b..69679c61 100644
--- a/doc/upstream-training/source/website/upstream-training-content.rst
+++ b/doc/upstream-training/source/website/upstream-training-content.rst
@@ -62,46 +62,55 @@ Module Tags
 
 The table below tags the modules relevant to different positions.
 
-+--------------------------+------------+----------+-------+
-|                          | 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            |            |    ✔     |   ✔   |
-+--------------------------+------------+----------+-------+
+* Management: Manages people that contribute to, deploy or use OpenStack.
+* Operator: Operates or is starting to deploy OpenStack.
+* User: Uses or is starting to use OpenStack.
+* New Developer: No experience with OpenStack at all. Never tried to
+  contribute and has little to no base knowledge.
+* Developer: Has some experience with OpenStack and the contribution process,
+  but could use some reference materials.
+
+
++--------------------------+------------+----------+-------+---------+-----+
+|                          | Management | Operator |  User | New Dev | Dev |
++==========================+============+==========+=======+=========+=====+
+| 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            |            |    ✔     |   ✔   |   ✔     |   ✔ |
++--------------------------+------------+----------+-------+---------+-----+