diff --git a/doc/upstream-training/source/slides/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst
index c8b18452..ad022521 100644
--- a/doc/upstream-training/source/slides/intro-introduction.rst
+++ b/doc/upstream-training/source/slides/intro-introduction.rst
@@ -22,16 +22,58 @@ About the training
   - How to deploy OpenStack
   - How to prepare for different exams
 
-Agenda
-======
+Agenda - Day 1
+==============
 
-- Day 1
+- Introduction
 
-  - TBD, when the blocks are ready
+  - Introducing OpenStack as a Software
+  - Introducing OpenStack as a Community
 
-- Day 2
+- How OpenStack is made
 
-  - TBD when the blocks are ready
+  - Official OpenStack projects
+  - OpenStack Governance
+  - Release cycle
+  - Communication
+  - Events
+
+- Development environment setup
+
+Agenda - Day 2, morning
+=======================
+
+- Workflow of an OpenStack contribution and tools
+
+  - Overview of the contribution process
+  - Registration and accounts
+  - Tracking
+  - Gerrit
+  - Reviewing
+  - Commit Messages
+  - Jenkins
+  - Metrics
+  - UC/WG intro
+
+Agenda - Day 2, afternoon
+=========================
+
+- Workflow of an OpenStack contribution and tools
+
+  - Guide to SetUp and Push First Patch
+  - Using Sandbox for Practice
+
+- Parallel modules
+
+  - Code deep dive
+
+    - Devstack
+    - Exercises
+
+  - Docco deep dive
+  - WG deep dive
+
+- Closing exercise
 
 Introductions
 =============
diff --git a/doc/upstream-training/source/slides/slide-index.rst b/doc/upstream-training/source/slides/slide-index.rst
index 7f897fc7..995dbea2 100644
--- a/doc/upstream-training/source/slides/slide-index.rst
+++ b/doc/upstream-training/source/slides/slide-index.rst
@@ -23,13 +23,10 @@ How OpenStack is Made
    :maxdepth: 1
 
    howitsmade-official-projects.rst
-   howitsmade-events.rst
-   howitsmade-metrics.rst
-   howitsmade-events.rst
-   howitsmade-release-cycle.rst
    howitsmade-governance.rst
+   howitsmade-release-cycle.rst
    howitsmade-communication.rst
-   branching-model.rst
+   howitsmade-events.rst
 
 Workflow and Tools for Participation
 ====================================
@@ -44,6 +41,7 @@ Workflow and Tools for Participation
    workflow-reviewing.rst
    workflow-commit-message.rst
    workflow-jenkins.rst
+   workflow-metrics.rst
    workflow-setup-and-first-patch.rst
    workflow-using-sandbox.rst
 
@@ -54,6 +52,7 @@ Code Deep Dive
    :maxdepth: 1
 
    code-devstack.rst
+   branching-model.rst
 
 Archive
 =======
diff --git a/doc/upstream-training/source/slides/howitsmade-metrics.rst b/doc/upstream-training/source/slides/workflow-metrics.rst
similarity index 100%
rename from doc/upstream-training/source/slides/howitsmade-metrics.rst
rename to doc/upstream-training/source/slides/workflow-metrics.rst
diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst
index 172bbca7..310493e5 100644
--- a/doc/upstream-training/source/website/index.rst
+++ b/doc/upstream-training/source/website/index.rst
@@ -106,11 +106,10 @@ How OpenStack is Made
 ---------------------
 
 * `Official OpenStack projects <howitsmade-official-projects.html>`_
-* `OpenStack Events <howitsmade-events.html>`_
-* `Metrics <howitsmade-metrics.html>`_
-* `Release cycle <howitsmade-release-cycle.html>`_
 * `OpenStack Governance <howitsmade-governance.html>`_
+* `Release cycle <howitsmade-release-cycle.html>`_
 * `Communication <howitsmade-communication.html>`_
+* `OpenStack Events <howitsmade-events.html>`_
 
 Workflow and Tools for Participation
 ------------------------------------
@@ -123,6 +122,7 @@ Workflow and Tools for Participation
 * `Reviewing <workflow-reviewing.html>`_
 * `Commit Messages <workflow-commit-message.html>`_
 * `Jenkins <workflow-jenkins.html>`_
+* `Metrics <workflow-metrics.html>`_
 * `Guide to SetUp and Push First Patch
   <workflow-setup-and-first-patch.html>`_
 * `Using Sandbox for Practice <workflow-using-sandbox.html>`_