diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 0e07a0a..da8ffb0 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -7,9 +7,9 @@
             ],
             "defines": [],
             "macFrameworkPath": [
-                "/Library/Developer/CommandLineTools/SDKs/MacOSX11.sdk/System/Library/Frameworks"
+                "/Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk/System/Library/Frameworks"
             ],
-            "compilerPath": "/opt/homebrew/opt/llvm/bin/clang",
+            "compilerPath": "/usr/bin/clang",
             "cStandard": "c99",
             "cppStandard": "c++11",
             "intelliSenseMode": "macos-clang-arm64",
diff --git a/Dockerfile b/Dockerfile
index 7705efd..ec9d5fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,17 @@
-FROM emscripten/emsdk:latest
+FROM jarnoharno/emsdk:latest
 
 RUN apt update && apt install -y python3 python3-pip \
-python3-setuptools python3-wheel ninja-build
+python3-setuptools python3-wheel
 RUN pip3 install meson
 
 WORKDIR /gcc-arm
-RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
-RUN tar -xf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+ARG TARGETARCH
+RUN if [ "$TARGETARCH" = "amd64" ]; \
+    then export TOOLCHAIN_ARCH="x86_64"; \
+    else export TOOLCHAIN_ARCH="aarch64"; \
+    fi; \
+    wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-$TOOLCHAIN_ARCH-linux.tar.bz2; \
+    tar -xf gcc-arm-none-eabi-10-2020-q4-major-$TOOLCHAIN_ARCH-linux.tar.bz2;
 
 ENV GCC_PATH=/gcc-arm/gcc-arm-none-eabi-10-2020-q4-major/bin
 RUN export PATH=$GCC_PATH:$PATH
diff --git a/docker-build-wasm.sh b/docker-build-wasm.sh
index 6fb4d1d..dddce0d 100755
--- a/docker-build-wasm.sh
+++ b/docker-build-wasm.sh
@@ -2,4 +2,4 @@
 
 # Build the Web Assembly version of Signaletic using a Docker container
 # that has all the appropriate dependencies installed.
-docker run --platform=linux/amd64 -v `pwd`:/signaletic signaletic /signaletic/cross-build-wasm.sh
+docker run -v `pwd`:/signaletic signaletic /signaletic/cross-build-wasm.sh