diff --git a/tox.ini b/tox.ini
index 52ff9db55d..95094a72d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,11 +46,13 @@ commands =
   # Build both RST User Guides
   {toxinidir}/tools/build-user-guides.sh
   # Copy RST user-guides
-  mkdir -p publish-docs/user-guides/content/
-  rsync -a doc/user-guides/build/html/ publish-docs/user-guides/content/
+  # TODO(ajaeger): We publish to content to allow for reviewing, this needs a
+  # change of openstack-doc-tools to remove content here
+  mkdir -p publish-docs/draft/user-guide/content/
+  rsync -a doc/user-guides/build/html/ publish-docs/draft/user-guide/content/
   # Copy RST user-guide-admincontent
-  mkdir -p publish-docs/user-guides-admin/content/
-  rsync -a doc/user-guides/build-admin/html/ publish-docs/user-guides-admin/content/
+  mkdir -p publish-docs/draft/user-guide-admin/content/
+  rsync -a doc/user-guides/build-admin/html/ publish-docs/draft/user-guide-admin/content/
   # Build RST networking guide
   sphinx-build -E -W doc/networking-guide/source doc/networking-guide/build/html
   mkdir -p publish-docs/networking-guide/content/
@@ -77,6 +79,14 @@ commands =
   # We only publish changed manuals.
   # Do not publish Install Guide and DocBook XML Networking Guide
   openstack-doc-test --check-build --ignore-book install-guide --ignore-book networking-guide --publish
+  # Build both RST User Guides
+  {toxinidir}/tools/build-user-guides.sh
+  # Copy RST user-guides - as draft for now
+  mkdir -p publish-docs/draft/user-guide/
+  rsync -a doc/user-guides/build/html/ publish-docs/draft/user-guide/
+  # Copy RST user-guide-admin
+  mkdir -p publish-docs/draft/user-guide-admin/
+  rsync -a doc/user-guides/build-admin/html/ publish-docs/draft/user-guide-admin/
   # Now publish www as well, we cannot do this from
   # openstack-doc-test. Use rsync so that .htaccess gets also
   # copied.