diff --git a/doc/upstream-training/14-gerrit.rst b/doc/upstream-training/14-gerrit.rst
new file mode 100644
index 00000000..c9b469e6
--- /dev/null
+++ b/doc/upstream-training/14-gerrit.rst
@@ -0,0 +1,134 @@
+review.openstack.org
+====================
+
+.. image:: ./_assets/14-01-review.png
+  :width: 100%
+
+----
+
+gerrit workflow
+===============
+
+.. image:: ./_assets/14-02-gerrit-workflow.png
+  :width: 100%
+
+----
+
+upload an ssh key
+=================
+
+- https://review.openstack.org/#/settings/ssh-keys
+
+.. image:: ./_assets/14-03-upload-ssh-key.png
+
+----
+
+git config
+==========
+
+- git config --global user.name "Firstname Lastname"
+- git config --global user.email "your_email@youremail.com"
+
+.. image:: ./_assets/14-04-git-config.png
+
+----
+
+Install git review
+==================
+
+- apt-get / yum / … git review
+
+.. image:: ./_assets/14-05-install.png
+
+----
+
+git clone
+=========
+
+.. image:: ./_assets/14-06-git-clone.png
+
+----
+
+git review -s
+=============
+
+.. image:: ./_assets/14-07-git-review-s.png
+
+----
+
+git checkout -b TOPIC-BRANCH
+============================
+
+.. image:: ./_assets/14-08-git-checkout.png
+
+----
+
+running unit tests
+==================
+
+.. image:: ./_assets/14-09-unit-tests.png
+
+----
+
+git review -D
+=============
+
+.. image:: ./_assets/14-10-git-review.png
+
+----
+
+invite reviewers
+================
+
+.. image:: ./_assets/14-11-invite-reviewers.png
+  :width: 100%
+
+----
+
+New interface: invite reviewers
+===============================
+
+.. image:: ./_assets/14-12-new-invite-reviewers.png
+
+----
+
+git commit --amend
+==================
+
+.. image:: ./_assets/14-13-git-commit-amend.png
+
+----
+
+git review -D ( repush )
+========================
+
+.. image:: ./_assets/14-14-git-repush.png
+
+----
+
+gerrit patchset history
+=======================
+
+.. image:: ./_assets/14-15-patchset-history.png
+
+----
+
+New interface: gerrit patchset history
+=======================================
+
+.. image:: ./_assets/14-16-new-patchset-history.png
+
+----
+
+patchset diffs
+==============
+
+.. image:: ./_assets/14-17-patchset-diffs.png
+
+----
+
+Exercise
+========
+
+push a wip or draft and invite reviewers
+
diff --git a/doc/upstream-training/_assets/14-01-review.png b/doc/upstream-training/_assets/14-01-review.png
new file mode 100644
index 00000000..c091cd0f
Binary files /dev/null and b/doc/upstream-training/_assets/14-01-review.png differ
diff --git a/doc/upstream-training/_assets/14-02-gerrit-workflow.png b/doc/upstream-training/_assets/14-02-gerrit-workflow.png
new file mode 100644
index 00000000..e7047ff1
Binary files /dev/null and b/doc/upstream-training/_assets/14-02-gerrit-workflow.png differ
diff --git a/doc/upstream-training/_assets/14-03-upload-ssh-key.png b/doc/upstream-training/_assets/14-03-upload-ssh-key.png
new file mode 100644
index 00000000..f52e68f8
Binary files /dev/null and b/doc/upstream-training/_assets/14-03-upload-ssh-key.png differ
diff --git a/doc/upstream-training/_assets/14-04-git-config.png b/doc/upstream-training/_assets/14-04-git-config.png
new file mode 100644
index 00000000..45adf992
Binary files /dev/null and b/doc/upstream-training/_assets/14-04-git-config.png differ
diff --git a/doc/upstream-training/_assets/14-05-install.png b/doc/upstream-training/_assets/14-05-install.png
new file mode 100644
index 00000000..6b266b53
Binary files /dev/null and b/doc/upstream-training/_assets/14-05-install.png differ
diff --git a/doc/upstream-training/_assets/14-06-git-clone.png b/doc/upstream-training/_assets/14-06-git-clone.png
new file mode 100644
index 00000000..71f18e1d
Binary files /dev/null and b/doc/upstream-training/_assets/14-06-git-clone.png differ
diff --git a/doc/upstream-training/_assets/14-07-git-review-s.png b/doc/upstream-training/_assets/14-07-git-review-s.png
new file mode 100644
index 00000000..ef4135b0
Binary files /dev/null and b/doc/upstream-training/_assets/14-07-git-review-s.png differ
diff --git a/doc/upstream-training/_assets/14-08-git-checkout.png b/doc/upstream-training/_assets/14-08-git-checkout.png
new file mode 100644
index 00000000..20726c21
Binary files /dev/null and b/doc/upstream-training/_assets/14-08-git-checkout.png differ
diff --git a/doc/upstream-training/_assets/14-09-unit-tests.png b/doc/upstream-training/_assets/14-09-unit-tests.png
new file mode 100644
index 00000000..d7bd720f
Binary files /dev/null and b/doc/upstream-training/_assets/14-09-unit-tests.png differ
diff --git a/doc/upstream-training/_assets/14-10-git-review.png b/doc/upstream-training/_assets/14-10-git-review.png
new file mode 100644
index 00000000..49028483
Binary files /dev/null and b/doc/upstream-training/_assets/14-10-git-review.png differ
diff --git a/doc/upstream-training/_assets/14-11-invite-reviewers.png b/doc/upstream-training/_assets/14-11-invite-reviewers.png
new file mode 100644
index 00000000..c52beb6d
Binary files /dev/null and b/doc/upstream-training/_assets/14-11-invite-reviewers.png differ
diff --git a/doc/upstream-training/_assets/14-12-new-invite-reviewers.png b/doc/upstream-training/_assets/14-12-new-invite-reviewers.png
new file mode 100644
index 00000000..0142cdfa
Binary files /dev/null and b/doc/upstream-training/_assets/14-12-new-invite-reviewers.png differ
diff --git a/doc/upstream-training/_assets/14-13-git-commit-amend.png b/doc/upstream-training/_assets/14-13-git-commit-amend.png
new file mode 100644
index 00000000..1e83116d
Binary files /dev/null and b/doc/upstream-training/_assets/14-13-git-commit-amend.png differ
diff --git a/doc/upstream-training/_assets/14-14-git-repush.png b/doc/upstream-training/_assets/14-14-git-repush.png
new file mode 100644
index 00000000..fdeed546
Binary files /dev/null and b/doc/upstream-training/_assets/14-14-git-repush.png differ
diff --git a/doc/upstream-training/_assets/14-15-patchset-history.png b/doc/upstream-training/_assets/14-15-patchset-history.png
new file mode 100644
index 00000000..94dd973d
Binary files /dev/null and b/doc/upstream-training/_assets/14-15-patchset-history.png differ
diff --git a/doc/upstream-training/_assets/14-16-new-patchset-history.png b/doc/upstream-training/_assets/14-16-new-patchset-history.png
new file mode 100644
index 00000000..8cad2cd8
Binary files /dev/null and b/doc/upstream-training/_assets/14-16-new-patchset-history.png differ
diff --git a/doc/upstream-training/_assets/14-17-patchset-diffs.png b/doc/upstream-training/_assets/14-17-patchset-diffs.png
new file mode 100644
index 00000000..0179e061
Binary files /dev/null and b/doc/upstream-training/_assets/14-17-patchset-diffs.png differ