diff --git a/.travis.yml b/.travis.yml
index 610dabd9..78f92d00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ stages:
   - name: docs
     if: tag =~ ^v(\d+|\.)*[^a-z]\d*$ OR tag = website AND NOT type = pull_request
   - name: docs_dev
-    if: tag =~ ^v(\d+|\.)*[a-z]\d*$ OR tag = website_dev OR commit_message =~ /^.*(website_dev).*$/ AND NOT type = pull_request
+    if: (tag =~ ^v(\d+|\.)*[a-z]\d*$) OR (tag = website_dev) OR ((commit_message =~ /\[doc-build\]/) and branch = master)
   - name: conda_dev_package
     if: tag =~ ^v(\d+|\.)*[a-z]\d*$
   - name: pip_dev_package
@@ -69,11 +69,15 @@ jobs:
       <<: *default
       stage: docs
       # not possible to run all examples to build website using only defaults (see setup.py)
-      env: DESC="docs" HV_DOC_HTML='true' CHANS_DOC="-c pyviz -c conda-forge"
-      script:
-        - doit develop_install $CHANS_DOC -o doc
-        - geoviews fetch-data --path=examples
+      env: DESC="docs" HV_DOC_HTML='true' CHANS_DEV="-c pyviz/label/dev -c conda-forge"
+      install:
+        - doit env_create $CHANS_DEV --python=$PYTHON_VERSION
+        - source activate test-environment
+        - doit develop_install $CHANS_DEV -o doc
+        - doit env_capture
         - bokeh sampledata
+        - geoviews fetch-data --path=examples
+      script:
         - nbsite generate-rst --org holoviz --project-name geoviews --offset 0
         - nbsite build --what=html --output=builtdocs
       deploy:
@@ -89,7 +93,6 @@ jobs:
 
     - <<: *doc_build
       stage: docs_dev
-      env: CHANS_DOC="-c pyviz/label/dev -c conda-forge"
       deploy:
         - provider: pages
           skip_cleanup: true
diff --git a/setup.py b/setup.py
index 80b71b82..591d4f10 100644
--- a/setup.py
+++ b/setup.py
@@ -163,6 +163,7 @@ def package_assets(example_path):
         'nbsite >=0.6.1',
         'sphinx_holoviz_theme',
         'selenium',
+        'proj<6.2.1'
     ],
     'tests': [
         'coveralls',