diff --git a/tools/buildlang.sh b/tools/buildlang.sh
index b5fe8e5b..7aedae83 100755
--- a/tools/buildlang.sh
+++ b/tools/buildlang.sh
@@ -74,9 +74,9 @@ for locale in `find ${DIRECTORY}/source/locale/ -maxdepth 1 -type d` ; do
         ${DIRECTORY}/source/website ${DIRECTORY}/build/slides/
 
     # move built guide to publish directory
-    mkdir -p publish-docs/${language}/${DOCNAME}/
-    rsync -a ${DIRECTORY}/build/slides/ publish-docs/${language}/${DOCNAME}/
-    echo $MARKER_TEXT > publish-docs/${language}/${DOCNAME}/.root-marker
+    mkdir -p publish-docs/html/${language}/${DOCNAME}/
+    rsync -a ${DIRECTORY}/build/slides/ publish-docs/html/${language}/${DOCNAME}/
+    echo $MARKER_TEXT > publish-docs/html/${language}/${DOCNAME}/.root-marker
 
     # remove newly created files
     git clean -f -q ${DIRECTORY}/source/locale/${language}/LC_MESSAGES/*.po
diff --git a/tox.ini b/tox.ini
index 786f11eb..79384dbc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ commands =
   {[testenv:upstream-slides]commands}
   {[testenv:training-slides]commands}
   # Publish for check site
-  mkdir -p publish-docs/upstream-training
-  mkdir -p publish-docs/training-guides
-  rsync -av doc/upstream-training/build/slides/ publish-docs/upstream-training/
-  rsync -av doc/training-guides/build/slides/ publish-docs/training-guides/
+  mkdir -p publish-docs/html/upstream-training
+  mkdir -p publish-docs/html/training-guides
+  rsync -av doc/upstream-training/build/slides/ publish-docs/html/upstream-training/
+  rsync -av doc/training-guides/build/slides/ publish-docs/html/training-guides/
 
 [testenv:generatepot-training]
 # Generate POT files for translation
@@ -55,19 +55,10 @@ commands =
 passenv = ZUUL*
 commands =
   {[testenv:upstream-slides]commands}
-  # Note(AJaeger):
-  # We do not publish draft documents anymore, disable this for now
-  # Once this document gets updated, we can discuss publishing to a
-  # new location
-  # {[testenv:training-slides]commands}
-  # Publish as draft
-  # mkdir -p publish-docs/draft/training-guides
-  # rsync -av doc/training-guides/build/slides/ publish-docs/draft/training-guides/
-  # {toxinidir}/tools/add-marker.sh publish-docs/draft/training-guides/
   # Publish
-  mkdir -p publish-docs/upstream-training
-  rsync -av doc/upstream-training/build/slides/ publish-docs/upstream-training/
-  {toxinidir}/tools/add-marker.sh publish-docs/upstream-training
+  mkdir -p publish-docs/html/upstream-training
+  rsync -av doc/upstream-training/build/slides/ publish-docs/html/upstream-training/
+  {toxinidir}/tools/add-marker.sh publish-docs/html/upstream-training
   # Publish translated guides
   {toxinidir}/tools/buildlang.sh