diff --git a/base_images/build-image.sh b/base_images/build-image.sh
index 94c01a8..34d406d 100755
--- a/base_images/build-image.sh
+++ b/base_images/build-image.sh
@@ -12,7 +12,8 @@ for dir in ${DIRS}; do
     pushd $base_image_dir/$dir
     IMAGE_NAME=$(basename $dir)
     IMAGE_REF=${CI_REGISTRY_IMAGE}/base_images/${IMAGE_NAME}:${BRANCH}
-    docker build -t ${IMAGE_REF} --build-arg IMAGE_REF=${IMAGE_REF} -f docker/Dockerfile .
+    DEFAULT_DOCKERFILE_PATH=${CI_REGISTRY_IMAGE}/custom_images/maap_base:${BRANCH}
+    docker build -t ${IMAGE_REF} --build-arg IMAGE_REF=${IMAGE_REF} --build-arg DEFAULT_DOCKERFILE_PATH=${DEFAULT_DOCKERFILE_PATH} -f docker/Dockerfile .
     docker push ${IMAGE_REF}
     popd
     echo "$IMAGE_REF" >> built_images.txt
diff --git a/base_images/isce3/docker/Dockerfile b/base_images/isce3/docker/Dockerfile
index 77b261c..958defe 100644
--- a/base_images/isce3/docker/Dockerfile
+++ b/base_images/isce3/docker/Dockerfile
@@ -23,4 +23,6 @@ RUN source activate isce3 && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
diff --git a/base_images/pangeo/docker/Dockerfile b/base_images/pangeo/docker/Dockerfile
index eb3894c..2f28d9a 100644
--- a/base_images/pangeo/docker/Dockerfile
+++ b/base_images/pangeo/docker/Dockerfile
@@ -20,4 +20,6 @@ RUN source activate pangeo && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
\ No newline at end of file
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
\ No newline at end of file
diff --git a/base_images/python/docker/Dockerfile b/base_images/python/docker/Dockerfile
index 734faf8..ed35c50 100644
--- a/base_images/python/docker/Dockerfile
+++ b/base_images/python/docker/Dockerfile
@@ -20,4 +20,6 @@ RUN source activate python && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
\ No newline at end of file
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
\ No newline at end of file
diff --git a/base_images/r/docker/Dockerfile b/base_images/r/docker/Dockerfile
index a740efd..4cefb09 100644
--- a/base_images/r/docker/Dockerfile
+++ b/base_images/r/docker/Dockerfile
@@ -55,4 +55,6 @@ RUN source activate r && \
     conda list
 
 ARG IMAGE_REF
-ENV DOCKERIMAGE_PATH=${IMAGE_REF}
\ No newline at end of file
+ENV DOCKERIMAGE_PATH_BASE_IMAGE=${IMAGE_REF}
+ARG DEFAULT_DOCKERFILE_PATH
+ENV DOCKERIMAGE_PATH_DEFAULT=${DEFAULT_DOCKERFILE_PATH}
\ No newline at end of file
diff --git a/custom_images/build-image.sh b/custom_images/build-image.sh
index 8b0edc9..fe21953 100755
--- a/custom_images/build-image.sh
+++ b/custom_images/build-image.sh
@@ -14,7 +14,8 @@ for dir in "${DIRS_LIST[@]}"; do
     IMAGE_NAME=$(basename "$dir")
     IMAGE_PATH=$(basename "$base_image_dir")
     IMAGE_REF=${CI_REGISTRY_IMAGE}/${IMAGE_PATH}/${IMAGE_NAME}:${BRANCH}
-    docker build -t "${IMAGE_REF}" --build-arg IMAGE_REF="${IMAGE_REF}" -f docker/Dockerfile .
+    DEFAULT_DOCKERFILE_PATH=${CI_REGISTRY_IMAGE}/custom_images/maap_base:${BRANCH}
+    docker build -t "${IMAGE_REF}" --build-arg IMAGE_REF="${IMAGE_REF}" --build-arg DEFAULT_DOCKERFILE_PATH=${DEFAULT_DOCKERFILE_PATH} -f docker/Dockerfile .
     docker push "${IMAGE_REF}"
     popd
     echo "$IMAGE_REF" >> built_images.txt
diff --git a/devfiles/isce3/devfile/devfile.yaml b/devfiles/isce3/devfile/devfile.yaml
index df3b020..eb817f2 100644
--- a/devfiles/isce3/devfile/devfile.yaml
+++ b/devfiles/isce3/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/isce3:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/isce3:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org
diff --git a/devfiles/pangeo/devfile/devfile.yaml b/devfiles/pangeo/devfile/devfile.yaml
index 2352e06..28b02f8 100644
--- a/devfiles/pangeo/devfile/devfile.yaml
+++ b/devfiles/pangeo/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/pangeo:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/pangeo:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org
diff --git a/devfiles/python/devfile/devfile.yaml b/devfiles/python/devfile/devfile.yaml
index aabc081..dbc4eb1 100644
--- a/devfiles/python/devfile/devfile.yaml
+++ b/devfiles/python/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/python:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/python:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org
diff --git a/devfiles/r/devfile/devfile.yaml b/devfiles/r/devfile/devfile.yaml
index c8bbc03..2672c8b 100644
--- a/devfiles/r/devfile/devfile.yaml
+++ b/devfiles/r/devfile/devfile.yaml
@@ -36,7 +36,9 @@ components:
                 image: 'mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/r:develop'
                 imagePullPolicy: Always
                 env:
-                - name: DOCKERIMAGE_PATH
+                - name: DOCKERIMAGE_PATH_DEFAULT
+                  value: 'mas.dit.maap-project.org/root/maap-workspaces/custom_images/maap_base:develop'
+                - name: DOCKERIMAGE_PATH_BASE_IMAGE
                   value: 'mas.dit.maap-project.org/root/maap-workspaces/base_images/r:develop'
                 - name: MAAP_API_HOST
                   value: api.dit.maap-project.org
diff --git a/jupyterlab/pangeo/environment.yml b/jupyterlab/pangeo/environment.yml
index f258e20..cfc8dfe 100644
--- a/jupyterlab/pangeo/environment.yml
+++ b/jupyterlab/pangeo/environment.yml
@@ -36,12 +36,12 @@ dependencies:
     - jupyter-resource-usage==1.0.2
     - git+https://github.com/MAAP-Project/stac_ipyleaflet.git@0.3.6#egg-info=stac_ipyleaflet
     - rio-tiler==6.2.8
-    - maap-algorithms-jupyter-extension==0.3.6
+    - maap-algorithms-jupyter-extension==0.3.8
     - maap-che-sidebar-visibility-jupyter-extension==1.1.2
     - maap-dps-jupyter-extension==0.7.2
     - maap-edsc-jupyter-extension==1.1.1
     - maap-help-jupyter-extension==2.0.0
-    - maap-jupyter-server-extension==2.1.0
+    - maap-jupyter-server-extension==2.1.1
     - maap-libs-jupyter-extension==1.2.4
     - maap-user-workspace-management-jupyter-extension==0.1.3
 variables:
diff --git a/jupyterlab/shared/environment.yml b/jupyterlab/shared/environment.yml
index 9671ccf..e5af699 100644
--- a/jupyterlab/shared/environment.yml
+++ b/jupyterlab/shared/environment.yml
@@ -18,12 +18,12 @@ dependencies:
   - pip:
     - jupyter-resource-usage==1.0.2
     - git+https://github.com/MAAP-Project/stac_ipyleaflet.git@0.3.6#egg-info=stac_ipyleaflet
-    - maap-algorithms-jupyter-extension==0.3.6
+    - maap-algorithms-jupyter-extension==0.3.8
     - maap-che-sidebar-visibility-jupyter-extension==1.1.2
     - maap-dps-jupyter-extension==0.7.2
     - maap-edsc-jupyter-extension==1.1.1
     - maap-help-jupyter-extension==2.0.0
-    - maap-jupyter-server-extension==2.1.0
+    - maap-jupyter-server-extension==2.1.1
     - maap-libs-jupyter-extension==1.2.4
     - maap-user-workspace-management-jupyter-extension==0.1.3
 variables: