diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8eb2473b..26d24726 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -55,6 +55,12 @@ jobs:
       contents: write
 
     steps:
+      - name: Maximize build space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+
       # Setup docker to build for multiple platforms, see:
       # https://github.com/docker/build-push-action/tree/master#usage
       # https://github.com/docker/build-push-action/blob/master/docs/advanced/multi-platform.md
diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile
index d550a042..dd824e02 100644
--- a/base-notebook/Dockerfile
+++ b/base-notebook/Dockerfile
@@ -109,6 +109,18 @@ RUN set -x && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
 
+# Using fixed version of mamba in arm, because the latest one has problems with arm under qemu
+# See: https://github.com/jupyter/docker-stacks/issues/1539
+RUN set -x && \
+    arch=$(uname -m) && \
+    if [ "${arch}" == "aarch64" ]; then \
+        mamba install --quiet --yes \
+            'mamba<0.18' && \
+            mamba clean --all -f -y && \
+            fix-permissions "${CONDA_DIR}" && \
+            fix-permissions "/home/${NB_USER}"; \
+    fi;
+
 # Install Jupyter Notebook, Lab, and Hub
 # Generate a notebook server config
 # Cleanup temporary files