diff --git a/documentation/toaster-manual/toaster-manual-setup-and-use.xml b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
index b148d4f405..2689ec9614 100644
--- a/documentation/toaster-manual/toaster-manual-setup-and-use.xml
+++ b/documentation/toaster-manual/toaster-manual-setup-and-use.xml
@@ -870,11 +870,57 @@
                     CPU usage, and disk I/O.
                     </para></listitem>
             </itemizedlist>
-            Following are several videos that show how to use the Toaster GUI.
-            To get a larger replay of a video after it has started playing,
-            click in the image title area.
+            Following are several videos that show how to use the Toaster GUI:
+            <itemizedlist>
+                <listitem><para><emphasis>Toaster Homepage and Table Controls:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=QEARDnrR1Xw'>video</ulink>
+                    goes over the Toaster entry page, and provides
+                    an overview of the data manipulation capabilities of
+                    Toaster, which include search, sorting and filtering by
+                    different criteria.
+                    </para></listitem>
+                <listitem><para><emphasis>Build Dashboard:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=KKqHYcnp2gE'>video</ulink>
+                    shows you the build dashboard, a page providing an
+                    overview of the information available for a selected build.
+                    </para></listitem>
+                <listitem><para><emphasis>Image Information:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=XqYGFsmA0Rw'>video</ulink>
+                    walks through the information Toaster provides
+                    about images: packages installed and root file system.
+                    </para></listitem>
+                <listitem><para><emphasis>Configuration:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=UW-j-T2TzIg'>video</ulink>
+                    shows the information Toaster provides about build
+                    configuration.
+                    </para></listitem>
+                <listitem><para><emphasis>Tasks:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=D4-9vGSxQtw'>video</ulink>
+                    shows the information Toaster provides about the
+                    tasks run by the build system.
+                    </para></listitem>
+                <listitem><para><emphasis>Recipes and Packages Built:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=x-6dx4huNnw'>video</ulink>
+                    shows the information Toaster provides about recipes
+                    and packages built.
+                    </para></listitem>
+                <listitem><para><emphasis>Performance Data:</emphasis>
+                    This
+                    <ulink url='https://www.youtube.com/watch?v=qWGMrJoqusQ'>video</ulink>
+                    shows the build performance data provided by
+                    Toaster.
+                    </para></listitem>
+            </itemizedlist>
         </para>
+    </section>
 
+<!--
         <section id='toaster-gui-vids-1'>
             <title>Toaster Homepage and Table Controls</title>
 
@@ -973,5 +1019,5 @@
                 </mediaobject>
             </para>
         </section>
-    </section>
+-->
 </chapter>