diff --git a/doc/doc-contrib-guide/source/team-structure.rst b/doc/doc-contrib-guide/source/team-structure.rst
index 98704032e6..11db7fa485 100644
--- a/doc/doc-contrib-guide/source/team-structure.rst
+++ b/doc/doc-contrib-guide/source/team-structure.rst
@@ -22,7 +22,7 @@ with their respective leads:
   Matjaz Pancur
 * `Training labs
   <https://wiki.openstack.org/wiki/Documentation/training-labs>`_:
-  Pranav Salunke, Roger Luethi
+  Roger Luethi, Julen Larrucea
 
 The current list of docs cores for openstack-manuals, openstackdocstheme,
 and openstack-doc-tools repositories can be found at
diff --git a/www/training_labs/index.html b/www/training_labs/index.html
index e79c2aa63f..ddba03116f 100644
--- a/www/training_labs/index.html
+++ b/www/training_labs/index.html
@@ -29,12 +29,12 @@
                         Master
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.tgz">
-                        Pike
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-queens.tgz">
+                        Queens
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-ocata.tgz">
-                        Ocata
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.tgz">
+                        Pike
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
                 </div>
@@ -46,12 +46,12 @@
                         Master
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.tgz">
-                        Pike
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-queens.tgz">
+                        Queens
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-ocata.tgz">
-                        Ocata
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.tgz">
+                        Pike
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
                 </div>
@@ -63,12 +63,12 @@
                         Master
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.zip">
-                        Pike
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-queens.zip">
+                        Queens
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
-                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-ocata.zip">
-                        Ocata
+                    <a class="overview-btn docs-btn" href="http://tarballs.openstack.org/training-labs/dist/labs-stable-pike.zip">
+                        Pike
                         <i class="fa fa-arrow-circle-o-down"></i>
                     </a>
                 </div>