diff --git a/assets/macos.Dockerfile b/assets/macos.Dockerfile
index 8a68319..a273693 100644
--- a/assets/macos.Dockerfile
+++ b/assets/macos.Dockerfile
@@ -33,29 +33,28 @@ RUN mkdir -p /osx-cross/MacOSX-SDKs &&\
     rm -f MacOSX11.3.sdk.tar.xz
 
 # run the bootstrap
-RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build &&\
-    tar xf librewolf-$version-$source_release.source.tar.gz &&\
-    cd librewolf-$version-$source_release &&\
-    echo ac_add_options --target=$arch-apple-darwin > mozconfig &&\
-    echo ac_add_options --enable-bootstrap >> mozconfig &&\
-    echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig &&\
-    MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser &&\
-    ./mach artifact toolchain --from-build linux64-libdmg &&\
-    ./mach artifact toolchain --from-build linux64-cctools-port &&\
-    ./mach artifact toolchain --from-build linux64-hfsplus &&\
-    ./mach artifact toolchain --from-build linux64-binutils &&\
-    ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross &&\
-    /root/.cargo/bin/cargo install cbindgen &&\
-    /root/.cargo/bin/rustup target add $arch-apple-darwin  &&\
-    cp -r binutils /root/.mozbuild &&\
-    cp -r cctools /root/.mozbuild &&\
-    cp -r clang /root/.mozbuild &&\
-    cp -r dmg /root/.mozbuild &&\
-    cp -r hfsplus-tools /root/.mozbuild &&\
-    pip install testresources pycairo &&\
-    cd .. &&\
-    rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
-
+RUN wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build
+RUN tar xf librewolf-$version-$source_release.source.tar.gz
+WORKDIR librewolf-$version-$source_release
+RUN echo ac_add_options --target=$arch-apple-darwin > mozconfig
+RUN echo ac_add_options --enable-bootstrap >> mozconfig
+RUN echo ac_add_options --with-macos-sdk=/osx-cross/MacOSX-SDKs/MacOSX11.3.sdk >> mozconfig
+RUN MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser
+RUN ./mach artifact toolchain --from-build linux64-libdmg
+RUN ./mach artifact toolchain --from-build linux64-cctools-port
+RUN ./mach artifact toolchain --from-build linux64-hfsplus
+RUN ./mach artifact toolchain --from-build linux64-binutils
+RUN ./mach artifact toolchain --from-build linux64-clang-13-macosx-cross
+RUN /root/.cargo/bin/cargo install cbindgen
+RUN /root/.cargo/bin/rustup target add $arch-apple-darwin
+RUN cp -r binutils /root/.mozbuild
+RUN cp -r cctools /root/.mozbuild
+RUN cp -r clang /root/.mozbuild
+RUN cp -r dmg /root/.mozbuild
+RUN cp -r hfsplus-tools /root/.mozbuild
+RUN pip install testresources pycairo
+WORKDIR ..
+RUN rm -rf librewolf-$version-$source_release librewolf-$version-$source_release.source.tar.gz
 
 # our work happens here, on the host filesystem.
 WORKDIR /work