diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6f697868..2fe666e1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -111,6 +111,10 @@ RUN wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_
 # For jupyter-panel-proxy launcher.
 ENV BOKEH_ALLOW_WS_ORIGIN "*"
 
+# For import xesmf since esmf-8.4.0, see
+# https://github.com/conda-forge/esmf-feedstock/issues/91
+ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"
+
 # problem running start-notebook.sh when being root
 # the jupyter/base-notebook image also do not default to root user so we do the same here
 USER jenkins
diff --git a/docker/Dockerfile.testing b/docker/Dockerfile.testing
index 9dc55272..84058b17 100644
--- a/docker/Dockerfile.testing
+++ b/docker/Dockerfile.testing
@@ -1,13 +1,15 @@
 # For testing quickly without having to do a full rebuild.
 
-FROM pavics/workflow-tests:220728
+FROM pavics/workflow-tests:230217
 
-USER root
+ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"
+
+#USER root
 
 # Use 'update' for existing and 'install' for new package.
 # Keep same channel ordering to not revert anything.
-RUN umask 0000 \
-    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy geopy
+#RUN umask 0000 \
+#    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyston -c pyviz/label/dev -c defaults -n birdy geopy
 #    && pip uninstall -y ravenpy \
 #    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp
 
@@ -20,4 +22,4 @@ RUN umask 0000 \
 #RUN umask 0000 \
 #    && pip install https://github.com/CSHS-CWRA/RavenPy/archive/refs/heads/master.zip
 
-USER jenkins
+#USER jenkins