diff --git a/doc/upstream-training/source/slides/development-environment-setup.rst b/doc/upstream-training/source/slides/development-environment-setup.rst
new file mode 100644
index 00000000..817841db
--- /dev/null
+++ b/doc/upstream-training/source/slides/development-environment-setup.rst
@@ -0,0 +1,21 @@
+=================================
+Setup the Development Environment
+=================================
+
+.. image:: ./_assets/os_background.png
+   :class: fill
+   :width: 100%
+
+Summary
+=======
+
+- Tools pre-packaged in a VM image
+
+  - Web browser: Firefox
+  - Terminal emulator: Xfce4-terminal
+  - Text editor: Geany
+  - IRC client: HexChat
+  - OpenStack sandbox environment: DevStack
+
+- VM image and instructions:
+  https://github.com/kmARC/openstack-training-virtual-environment/blob/master/README.md
diff --git a/doc/upstream-training/source/slides/intro-introduction.rst b/doc/upstream-training/source/slides/intro-introduction.rst
index 7234591b..ef42f1af 100644
--- a/doc/upstream-training/source/slides/intro-introduction.rst
+++ b/doc/upstream-training/source/slides/intro-introduction.rst
@@ -30,6 +30,7 @@ Agenda - Day 1
   - Introducing OpenStack as a Software
   - Introducing OpenStack as a Community
 
+- Development environment setup
 - How OpenStack is made
 
   - Official OpenStack projects
@@ -38,8 +39,6 @@ Agenda - Day 1
   - Communication
   - Events
 
-- Development environment setup
-
 Agenda - Day 2, morning
 =======================
 
diff --git a/doc/upstream-training/source/slides/slide-index.rst b/doc/upstream-training/source/slides/slide-index.rst
index ae1a21e4..d50ef88f 100644
--- a/doc/upstream-training/source/slides/slide-index.rst
+++ b/doc/upstream-training/source/slides/slide-index.rst
@@ -16,6 +16,14 @@ Introduction
    intro-openstack-as-software.rst
    intro-openstack-as-community.rst
 
+Setup the Development Environment
+=================================
+
+.. toctree::
+   :maxdepth: 1
+
+   development-environment-setup.rst
+
 How OpenStack is Made
 =====================
 
diff --git a/doc/upstream-training/source/website/index.rst b/doc/upstream-training/source/website/index.rst
index 48daec00..c488c08a 100644
--- a/doc/upstream-training/source/website/index.rst
+++ b/doc/upstream-training/source/website/index.rst
@@ -141,6 +141,11 @@ Introduction
 * `Introducing OpenStack as a Software <intro-openstack-as-software.html>`_
 * `Introducing OpenStack as a Community <intro-openstack-as-community.html>`_
 
+Setup the Development Environment
+---------------------------------
+
+* `Environment Setup <development-environment-setup.html>`_
+
 How OpenStack is Made
 ---------------------