diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3bb579d..c57cb9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -65,6 +65,9 @@ jobs:
             registry: ${{ env.DOCKER_REGISTRY }}
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v5
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -128,6 +131,9 @@ jobs:
             registry: ${{ env.DOCKER_REGISTRY }}
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v5
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/base-image/Dockerfile b/base-image/Dockerfile
index aa03c9c..b148ff1 100644
--- a/base-image/Dockerfile
+++ b/base-image/Dockerfile
@@ -92,9 +92,6 @@ ENTRYPOINT ["/usr/local/bin/_entrypoint.sh", "/srv/start"]
 # ----------------------
 ONBUILD USER root
 
-# Set default shell for system setup
-ONBUILD SHELL ["/bin/sh", "-c"]
-
 # FIXME (?): user and home folder is hardcoded for now
 # FIXME (?): this line breaks the cache of all steps below
 ONBUILD COPY --chown=${NB_USER}:${NB_USER} . ${HOME}
@@ -102,9 +99,6 @@ ONBUILD COPY --chown=${NB_USER}:${NB_USER} . ${HOME}
 # Make sure that /opt/conda is owned by non-root user, so we can install additional packages
 ONBUILD RUN chown -R ${NB_USER}:${NB_USER} ${CONDA_DIR}
 
-# Put the shell back to the micromamba shell
-ONBUILD SHELL ["/usr/local/bin/_dockerfile_shell.sh"]
-
 # repo2docker will load files from a .binder or binder directory if
 # present. We check if those directories exist, and print a diagnostic
 # message here.