diff --git a/doc/upstream-training/source/04-program-ecosystem.rst b/doc/upstream-training/source/04-program-ecosystem.rst
index 988e52e1..a50156e1 100644
--- a/doc/upstream-training/source/04-program-ecosystem.rst
+++ b/doc/upstream-training/source/04-program-ecosystem.rst
@@ -1,55 +1,85 @@
-===========================
-OpenStack Program Ecosystem
-===========================
+=============================
+OpenStack "Big Tent" and tags
+=============================
 
 .. image:: ./_assets/os_background.png
    :class: fill
    :width: 100%
 
-Lifecycle of a new Program
-==========================
-
-.. image:: ./_assets/04-01-lifecycle1.png
-  :width: 100%
-
-External
-========
+Old way of adding new Projects
+==============================
 
 .. image:: ./_assets/04-02-lifecycle.png
   :width: 100%
 
-- Idea
-- Gather a community
-- Alternate implementations
-- Stackforge
-- File an OpenStack incubation request
+- Created too much pressure to `integrate`
+- Did not scale
+- Superseded by *Big tent* approach with `tags`
 
-Incubated
-=========
+OpenStack Project Teams
+=======================
 
-.. image:: ./_assets/04-03-lifecycle.png
-  :width: 100%
+- The building blocks to achieve OpenStack's mission
+- Teams of people using tools (code repository, bug tracker, etc) and
+  coordinated processes to produce a number of deliverables
+- The Technical Committee reviews Working Groups interested in
+  becoming official OpenStack Project Teams
 
-- Fill the gap with graduation requirements
-- Align with the OpenStack way
-- Two development milestones
-- Migrate to the openstack/* namespace
-- Graduation review
+How to form new Project Team
+============================
 
-Integrated
-==========
+- Start from groups of people working in the same area
+- As these grow naturally they can apply to become Official
+- TC will check:
 
-.. image:: ./_assets/04-04-lifecycle.png
-  :width: 100%
+  - Alignment with OpenStack mission
+  - Interoperability with other projects
+  - Active and diverse team of contributors
+  - Group can follow the four *Open*
 
-- Cannot graduate in the middle of a cycle
-- Follow a full cycle as an integrated project
+    - Open Source
+    - Open Community
+    - Open Design
+    - Open Development
+
+Tags describing OpenStack Projects
+==================================
+
+- Describe the output produced by the OpenStack community teams
+
+  - Software, documentation, release management etc
+  - http://governance.openstack.org/reference/projects/index.html
+
+- Current tags describe how projects are released and team diversity
+- Other tags can be proposed by anyone
+
+  - List of approved tags
+  - http://governance.openstack.org/reference/tags/index.html
 
 Core (or What is OpenStack)
 ===========================
 
-- DefCore initiative, sponsored by the Board of Directors
-- Currently work in progress for qualifying APIs
+.. image:: ./_assets/04-02-defcore.png
+
+- DefCore initiative:
+
+  - guiding principles" used by the Foundation Board to determine how
+    commercial implementations of OpenStack can be granted use of the
+    trademark
+
+DefCore principles
+==================
+
+- Implementations that are Core can use OpenStack trademark
+  (OpenStack™)
+- Core is a subset of the whole project
+- Claiming OpenStack requiring use of designated upstream code
+- Projects must have an open reference implementation
+- Vendors may substitute alternate implementations
+- Tests can be remotely or self-administered
+- A subset of tests are chosen by the Foundation as "must-pass"
+- OpenStack Core means passing all "must-pass" tests
+
 
 Stackforge
 ==========
@@ -80,4 +110,4 @@ How to add a project to Stackforge
 Exercise
 ========
 
-What kind of program do you want to contribute to?
+What kind of project do you want to contribute to?
diff --git a/doc/upstream-training/source/_assets/04-02-defcore.png b/doc/upstream-training/source/_assets/04-02-defcore.png
new file mode 100644
index 00000000..d100ddff
Binary files /dev/null and b/doc/upstream-training/source/_assets/04-02-defcore.png differ