diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 624cee52..463b5d58 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,8 +54,8 @@ jobs:
         shell: bash -l {0}
     env:
       CHANS_DEV: "-c pyviz/label/dev -c conda-forge"
-      PKG_TEST_PYTHON: "--test-python=py38"
-      PYTHON_VERSION: "3.8"
+      PKG_TEST_PYTHON: "--test-python=py39"
+      PYTHON_VERSION: "3.9"
       MPLBACKEND: "Agg"
       PPU: ${{ secrets.PPU }}
       PPP: ${{ secrets.PPP }}
@@ -79,7 +79,7 @@ jobs:
       - name: env setup
         run: |
           conda activate test-environment
-          doit develop_install -o tests
+          doit develop_install $CHANS_DEV -o tests
           doit pip_on_conda
       - name: pip build
         run: |
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
deleted file mode 100644
index 12847b66..00000000
--- a/doc/_templates/layout.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{%- extends "!layout.html" %}
-
-{% block docs_navbar %}
-<nav class="navbar navbar-light navbar-expand-lg fixed-top bd-navbar" id="navbar-main">
-    {%- include "sections/header.html" %}
-</nav>
-{% endblock %}
-
-{% block docs_sidebar %}
-{% if sidebars %}
-<!-- Only show if we have sidebars configured, else just a small margin  -->
-<div class="col-12 col-md-2 bd-sidebar">
-  {%- for sidebartemplate in sidebars %}
-  {%- include sidebartemplate %}
-  {%- endfor %}
-</div>
-{% else %}
-<div class="col-12 col-md-1 col-xl-2 bd-sidebar no-sidebar"></div>
-{% endif %}
-{% endblock %}
-
-{% block docs_toc %}
-<div class="d-none d-xl-block col-xl-2 bd-toc">
-  {% if meta is defined and not (meta is not none and 'notoc' in meta) %}
-  {% for toc_item in theme_page_sidebar_items %}
-  <div class="toc-item">
-    {% include toc_item %}
-  </div>
-  {% endfor %}
-  {% endif %}
-  {% if ('gallery' in pagename or 'reference' in pagename or 'user_guide' in pagename) and not pagename.endswith('index') %}
-  <a href="https://mybinder.org/v2/gh/holoviz/panel/{{ last_release }}?urlpath=lab/tree/examples/{{ pagename }}.ipynb" style="padding-left: 1.5rem;">Open this page in Binder</a>
-  {% endif %}
-</div>
-{% endblock %}
-
-{% block docs_main %}
-{% if sidebars %}
-{% set content_col_class = "col-md-10 col-xl-8" %}
-{% else %}
-{% set content_col_class = "col-md-11 col-xl-8" %}
-{% endif %}
-<div class="bd-content col-12 {{ content_col_class }}" role="main">
-  {% block docs_body %}
-  <article class="bd-article" role="main">
-    {% block body %} {% endblock %}
-  </article>
-  {% endblock %}
-  {% if theme_show_prev_next %}
-  <footer class="bd-footer-article">
-    {% include "sections/footer-article.html" %}
-  </footer>
-  {% endif %}
-</div>
-{% endblock %}
diff --git a/doc/_templates/sections/sidebar-primary.html b/doc/_templates/sections/sidebar-primary.html
deleted file mode 100644
index c19a1ffd..00000000
--- a/doc/_templates/sections/sidebar-primary.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% block docs_sidebar %}
-{% if sidebars %}
-<!-- Only show if we have sidebars configured, else just a small margin  -->
-<div class="bd-sidebar-primary col-12 col-md-2 bd-sidebar">
-  <div class="sidebar-start-items">
-    {%- for sidebartemplate in sidebars %}
-    {%- include sidebartemplate %}
-    {%- endfor %}
-  </div>
-  <div class="sidebar-end-items">
-    {%- for leftsidebartemplate in theme_left_sidebar_end %}
-    {%- include leftsidebartemplate %}
-    {%- endfor %}
-  </div>
-</div>
-{% else %}
-<div class="sidebar-primary col-12 col-md-1 col-xl-2 bd-sidebar no-sidebar"></div>
-{% endif %}
-{% endblock %}
diff --git a/doc/_templates/sidebar-nav-bs.html b/doc/_templates/sidebar-nav-bs.html
deleted file mode 100644
index 2adee94a..00000000
--- a/doc/_templates/sidebar-nav-bs.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<nav class="bd-links" id="bd-docs-nav" aria-label="{{ _('Main navigation') }}">
-  <div class="bd-toc-item active">
-    {{ generate_nav_html("sidebar",
-                         show_nav_level=theme_show_nav_level|int,
-                         maxdepth=theme_navigation_depth|int,
-                         collapse=theme_collapse_navigation|tobool,
-                         includehidden=True,
-                         startdepth=0,
-                         titles_only=True) }}
-  </div>
-</nav>
diff --git a/setup.py b/setup.py
index dfbde49d..1243d9f5 100644
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,10 @@ def get_setup_version(reponame):
     "numpy",
     "bokeh",
     "param >=1.9.0",
-    "panel >=1.2.1",
+    "panel >=1.2.0",
     "pandas",
     "hvplot",
-    "holoviews >=1.17.1",
+    "holoviews >=1.17.0",
     "packaging",
     "intake",
     "jinja2 >3.0"