diff --git a/Jenkinsfile b/Jenkinsfile
index 8877b1ba..80d60b49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:210723"
+            image "pavics/workflow-tests:210728"
             label 'linux && docker'
         }
     }
diff --git a/binder/Dockerfile b/binder/Dockerfile
index e702d7dd..55106612 100644
--- a/binder/Dockerfile
+++ b/binder/Dockerfile
@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:210723
+FROM pavics/workflow-tests:210728
 
 USER root
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 152f3ab2..00195c34 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,16 +40,8 @@ RUN jupyter lab build
 RUN jupyter labextension install @jupyter-widgets/jupyterlab-manager \
     && jupyter serverextension enable voila --sys-prefix \
     && jupyter labextension install @jupyter-widgets/jupyterlab-manager jupyter-leaflet \
-    && jupyter labextension install @bokeh/jupyter_bokeh \
-    && jupyter labextension install @pyviz/jupyterlab_pyviz \
-    && jupyter labextension install @jupyterlab/debugger \
-    && jupyter labextension install @jupyterlab/google-drive \
-    && jupyter labextension install jupyterlab-topbar-extension \
-                                    jupyterlab-system-monitor \
-                                    jupyterlab-topbar-text \
-                                    jupyterlab-logout \
-                                    jupyterlab-theme-toggle \
-                                    jupyterlab_conda
+    && jupyter labextension install jupyterlab-topbar-text \
+                                    jupyterlab-theme-toggle
 #    && jupyter labextension install jupyterlab-clipboard
 
 ADD https://raw.githubusercontent.com/jupyter/docker-stacks/master/base-notebook/start.sh /usr/local/bin/
diff --git a/docker/environment.yml b/docker/environment.yml
index 5612a01d..ea589fb4 100644
--- a/docker/environment.yml
+++ b/docker/environment.yml
@@ -23,9 +23,7 @@ dependencies:
   - rasterio
   - gdal  # for osgeo
   - geopandas
-  # Pin pandas due to xarray
-  # https://github.com/pydata/xarray/issues/5588#issuecomment-885271773
-  - pandas==1.2.5
+  - pandas
   - rioxarray
   - scikit-image
   - ipyleaflet
@@ -37,6 +35,8 @@ dependencies:
   - pscript
   - h5netcdf
   - panel
+  # https://github.com/holoviz/panel
+  - pyviz_comms  # (was labextension pyviz/jupyterlab_pyviz in jupyterlab v2)
   - holoviews
   - geoviews
   # this might still be relevant https://github.com/holoviz/hvplot/issues/498
@@ -91,19 +91,25 @@ dependencies:
   - jupyter
   # to be launched by image jupyterhub/jupyterhub
   - notebook
-  - jupyterlab==2.2.9
+  - jupyterlab
   - jupyterhub
+  # https://github.com/mamba-org/gator (was jupyter_conda)
+  - mamba_gator
   # to diff .ipynb files
   - nbdime
   # extension to produce .py files from notebook .ipynb files
   - jupytext
   # jupyterlab extension for git
   - jupyterlab-git
-  # jupyterlab extension for conda
-  - jupyter_conda
   # Voila turns Jupyter notebooks into standalone web applications
   - voila
   - jupyter-archive
+  # https://github.com/jtpio/jupyterlab-topbar
+  - jupyterlab-topbar
+  # https://github.com/jtpio/jupyterlab-system-monitor (was from jupyterlab-topbar)
+  - jupyterlab-system-monitor
+  - jupyter-resource-usage  # needed by jupyterlab-system-monitor
+  - nbresuse  # needed by jupyterlab-system-monitor
   # xeus-python: back-end kernel implementing the Jupyter Debug Protocol
   - xeus-python
   - jupyter-dash
@@ -126,8 +132,8 @@ dependencies:
     # https://github.com/ShopRunner/jupyter-notify
     # Jupyter Magic For Browser Notifications of Cell Completion.
     - jupyternotify
-    # Needed for https://github.com/jtpio/jupyterlab-topbar
-    - nbresuse
+    # https://github.com/jupyterlab-contrib/jupyterlab-logout (was from jupyterlab-topbar)
+    - jupyterlab-logout
     # Needed to run notebook tests.  Missing indirect recursive dependencies
     # somewhere, should not need to manually add it here.
     - pytest-tornasync
diff --git a/launchcontainer b/launchcontainer
index 6f680d63..4fbf5ebd 100755
--- a/launchcontainer
+++ b/launchcontainer
@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:210723"
+    DOCKER_IMAGE="pavics/workflow-tests:210728"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then
diff --git a/launchnotebook b/launchnotebook
index be86e4a5..a974ce8e 100755
--- a/launchnotebook
+++ b/launchnotebook
@@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
 fi
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:210723"
+    DOCKER_IMAGE="pavics/workflow-tests:210728"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then