diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index 884c370..13b2583 100644
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -42,6 +42,7 @@
           wipe-workspace: true
           submodule:
             recursive: '{submodule-recursive}'
+            timeout: '12'
 
     wrappers:
       - infra-wrappers:
@@ -76,6 +77,8 @@
           pip freeze
           cd $WORKSPACE/{path}
           tox
+          mkdir -p "$WORKSPACE/archives"
+          mv  docs/_build/html "$WORKSPACE/archives/"
 
     publishers:
       - infra-shiplogs:
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 03a9e18..018f74a 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -18,3 +18,5 @@
           branch: 'master'
       - amsterdam:
           branch: 'amsterdam'
+      - beijing:
+          branch: 'beijing'