diff --git a/doc/upstream-training/20-training-agile-for-contributors.rst b/doc/upstream-training/20-training-agile-for-contributors.rst
new file mode 100644
index 00000000..1cc5e773
--- /dev/null
+++ b/doc/upstream-training/20-training-agile-for-contributors.rst
@@ -0,0 +1,109 @@
+Lego applied to Free Software contributions
+===========================================
+
+
+OpenStack Upstream Training
+---------------------------
+
+ <teacher name>
+ <date>
+
+----
+
+Agile manifesto
+===============
+
+- Customer satisfaction by rapid delivery of useful software
+- Welcome changing requirements, even late in development
+- Working software is delivered frequently (weeks rather than months)
+- Working software is the principal measure of progress
+- Sustainable development, able to maintain a constant pace
+- Close, daily co-operation between business people and developers
+- Face-to-face conversation is the best form of communication (co-location)
+- Projects are built around motivated individuals, who should be trusted
+- Continuous attention to technical excellence and good design
+- Simplicity- The art of maximizing the amount of work not done - is essential
+- Self-organizing teams
+- Regular adaptation to changing circumstances
+
+----
+
+Applying agile
+==============
+
+- Finding Roles : Product Owner, Scrum Master and Team Member
+- No person has an ideal role
+- The role is hidden
+- Discovering the roles is an ongoing work
+
+----
+
+Lego town
+=========
+
+- Upstream project : a lego town
+- Company deadline : lego exhibition
+- Epic: become a major contributor and demonstrate the company skills during the exhibition
+
+----
+
+Upstream
+========
+
+- Board : 1
+- Technical committee : 1
+- PTL : 1
+- Core : 5
+
+----
+
+Company
+=======
+
+- CEO : 1
+- Product owner : 1
+- Scrum Master : 1
+- Team members : 5
+
+----
+
+Free Software contributors
+==========================
+
+- Distracted : 1
+- Controversial : 1
+- Agreeable : X
+
+----
+
+Epic
+====
+
+- Discuss with the product owner
+- Write user stories
+
+----
+
+Sprint
+======
+
+- 5 minutes planning
+- 15 minutes building
+- 5 minutes review
+
+.. image:: ./_assets/20-01-sprint.png
+
+----
+
+Communication
+=============
+
+----
+
+Diplomacy
+=========
+
+----
+
+Time to play with Legos
+=======================
diff --git a/doc/upstream-training/_assets/20-01-sprint.png b/doc/upstream-training/_assets/20-01-sprint.png
new file mode 100644
index 00000000..369e09f9
Binary files /dev/null and b/doc/upstream-training/_assets/20-01-sprint.png differ