diff --git a/doc/upstream-training/source/slides/_assets/11-01-devstack.png b/doc/upstream-training/source/slides/_assets/11-01-devstack.png
deleted file mode 100644
index 96bc91e6..00000000
Binary files a/doc/upstream-training/source/slides/_assets/11-01-devstack.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/11-04-git.png b/doc/upstream-training/source/slides/_assets/11-04-git.png
deleted file mode 100644
index 68a148ee..00000000
Binary files a/doc/upstream-training/source/slides/_assets/11-04-git.png and /dev/null differ
diff --git a/doc/upstream-training/source/slides/_assets/11-03-http-localhost.png b/doc/upstream-training/source/slides/_assets/devstack-http-localhost.png
similarity index 100%
rename from doc/upstream-training/source/slides/_assets/11-03-http-localhost.png
rename to doc/upstream-training/source/slides/_assets/devstack-http-localhost.png
diff --git a/doc/upstream-training/source/slides/_assets/devstack-screen.png b/doc/upstream-training/source/slides/_assets/devstack-screen.png
new file mode 100644
index 00000000..b3e2b0c6
Binary files /dev/null and b/doc/upstream-training/source/slides/_assets/devstack-screen.png differ
diff --git a/doc/upstream-training/source/slides/code-devstack.rst b/doc/upstream-training/source/slides/code-devstack.rst
index 355b9eb4..5cc847bd 100644
--- a/doc/upstream-training/source/slides/code-devstack.rst
+++ b/doc/upstream-training/source/slides/code-devstack.rst
@@ -6,24 +6,44 @@ Demo environment
    :class: fill
    :width: 100%
 
-devstack.org
-============
+DevStack
+========
 
-.. image:: ./_assets/11-01-devstack.png
-   :width: 100%
+- A bunch of scripts to build a full OpenStack environment
+- Used as
+
+  - Demo environment
+  - Part of the OpenStack project's functional testing
+
+- Single and multi node setup
+- Installs services from source
+
+  - from git master by default
+  - from stable branches by configuration, e.g. stable/newton
+
+- Documentation: http://docs.openstack.org/developer/devstack/
 
 http://localhost/
 =================
 
-.. image:: ./_assets/11-03-http-localhost.png
+.. image:: ./_assets/devstack-http-localhost.png
   :width: 100%
 
-http://localhost/
+Service terminals
 =================
 
-.. image:: ./_assets/11-04-git.png
+- Using Linux 'screen'
+- Access the terminals the installed services are running in
+- Use command 'screen -x' to see the running services
+- For further commands see the
+  `User's Manual <https://www.gnu.org/software/screen/manual/screen.html>`_
+
+.. image:: ./_assets/devstack-screen.png
+  :width: 90%
+  :align: center
 
 Exercise
 ========
 
-Get the code for the targeted contribution
+- Ensure you have the DevStack repository cloned to the VM you would like to
+  use it