diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc98686..fb7e29c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,20 +15,26 @@ jobs:
   build-image:
     name: Build image
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    # timeout-minutes: 40
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Log into container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -38,11 +44,17 @@ jobs:
             type=sha
             type=semver,pattern={{version}},enable=${{ github.event_name == 'release' }}
             type=semver,pattern={{major}},enable=${{ github.event_name == 'release' }}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name == 'release' }}
+            type=edge
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
+          target: alfalfa-dependencies
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.output.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.output.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index 259c648..582651a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,95 +1,289 @@
-FROM ubuntu:20.04 AS base
+ARG PYTHON_VERSION=3.10.14
+ARG DEBIAN_VERSION=bookworm
 
-USER root
+# Build modelica-dependencies on bullseye (this uses an older version of GLibc which allows for making manylinux wheels)
+FROM python:${PYTHON_VERSION}-slim-bullseye AS modelica-dependencies
+ARG SUNDIALS_VERSION=v7.1.1
+ARG ASSIMULO_VERSION=3.5.2
+RUN apt-get update \
+  && apt-get install -y \
+  cmake \
+  liblapack-dev \
+  libsuitesparse-dev \
+  libhypre-dev \
+  curl \
+  git \
+  build-essential \
+  dpkg-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN python3 -m pip install \
+  Cython \
+  numpy \
+  scipy \
+  matplotlib \
+  setuptools==69.1.0 \
+  auditwheel \
+  patchelf
+
+RUN gnuArch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)"; \
+ln -s /usr/lib/$gnuArch/libblas.so /usr/lib/$gnuArch/libblas_OPENMP.so
+
+WORKDIR /build
+
+RUN curl -fSsL https://portal.nersc.gov/project/sparse/superlu/superlu_mt_3.1.tar.gz | tar xz \
+  && cd SuperLU_MT_3.1 \
+  && make CFLAGS="-O2 -fPIC -fopenmp" BLASLIB="-lblas" PLAT="_OPENMP" MPLIB="-fopenmp" lib -j1 \
+  && cp -v ./lib/libsuperlu_mt_OPENMP.a /usr/lib \
+  && cp -v ./SRC/*.h /usr/include
+
+RUN git clone --depth 1 -b ${SUNDIALS_VERSION} https://github.com/LLNL/sundials.git \
+  && cd sundials \
+  && mkdir build && cd build \
+  && cmake \
+  -LAH \
+  -DSUPERLUMT_BLAS_LIBRARIES=blas \
+  -DSUPERLUMT_LIBRARIES=blas \
+  -DSUPERLUMT_INCLUDE_DIR=/usr/include \
+  -DSUPERLUMT_LIBRARY=/usr/lib/libsuperlu_mt_OPENMP.a \
+  -DSUPERLUMT_THREAD_TYPE=OpenMP \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DSUPERLUMT_ENABLE=ON \
+  -DSUNDIALS_INDEX_SIZE=32 \
+  -DLAPACK_ENABLE=ON \
+  -DEXAMPLES_ENABLE=OFF \
+  -DEXAMPLES_ENABLE_C=OFF \
+  .. \
+  && make -j4 \
+  && make install
+
+RUN gnuArch="$(dpkg-architecture --query DEB_HOST_MULTIARCH)" \
+  && git clone --depth 1 -b Assimulo-3.5.2 https://github.com/modelon-community/Assimulo.git \
+  && cd Assimulo \
+  && python3 setup.py bdist_wheel --sundials-home=/usr --blas-home=/usr/lib/${gnuArch} --lapack-home=/usr/lib/${gnuArch} --superlu-home=/usr \
+  && auditwheel repair --plat manylinux_2_31_$(uname -m) build/dist/*.whl \
+  && pip3 install wheelhouse/*.whl
 
-ENV HOME /alfalfa
+RUN git clone --depth 1 -b 2.4.1 https://github.com/modelon-community/fmi-library.git \
+  && cd fmi-library \
+  && sed -i "/CMAKE_INSTALL_PREFIX/d" CMakeLists.txt \
+  && mkdir fmi_build && cd fmi_build \
+  && mkdir fmi_library \
+  && cmake -DCMAKE_INSTALL_PREFIX=/build/fmi-libary/fmi_library .. \
+  && make -j4 \
+  && make install
 
-# Need to set the lang to use Python 3.8 with Poetry
-ENV LANG C.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-ENV ROOT_DIR /usr/local
-ENV BUILD_DIR $HOME/build
+RUN git clone --depth 1 -b PyFMI-2.13.1 https://github.com/modelon-community/PyFMI.git \
+  && cd PyFMI \
+  && python3 setup.py bdist_wheel --fmil-home=/build/fmi-libary/fmi_library --with-openmp\
+  && auditwheel repair --plat manylinux_2_31_$(uname -m) dist/*.whl
 
+WORKDIR /artifacts
+
+RUN cp /build/Assimulo/wheelhouse/* . \
+  && cp /build/PyFMI/wheelhouse/* .
+
+RUN gnuArch="$(dpkg-architecture --query DEB_HOST_ARCH_CPU)"\
+  && curl -SfL http://ftp.us.debian.org/debian/pool/main/g/gcc-7/libgfortran4_7.4.0-6_${gnuArch}.deb -o libgfortran4.deb \
+  && curl -SfL http://ftp.us.debian.org/debian/pool/main/g/gcc-7/gcc-7-base_7.4.0-6_${gnuArch}.deb -o gcc-7.deb \
+  && curl -SfL https://archive.debian.org/debian/pool/main/g/gcc-6/gcc-6-base_6.3.0-18+deb9u1_${gnuArch}.deb -o gcc-6.deb \
+  && curl -SfL https://archive.debian.org/debian/pool/main/g/gcc-6/libgfortran3_6.3.0-18+deb9u1_${gnuArch}.deb -o libgfortran3.deb
+
+FROM python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} AS energyplus-dependencies
+ARG OPENSTUDIO_VERSION=3.8.0
+ARG OPENSTUDIO_VERSION_SHA=f953b6fcaf
+ARG ENERGYPLUS_VERSION=24.1.0
+ARG ENERGYPLUS_VERSION_SHA=9d7789a3ac
 
 RUN apt-get update \
-    && apt-get install -y \
-    ca-certificates \
-    curl \
+  && apt-get install -y \
+  curl \
+  && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /artifacts
+
+RUN export gnuArch=x86_64; if [ "$(uname -m)" = "aarch64" ]; then gnuArch=arm64; fi; export gnuArch \
+  && echo https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}/EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_VERSION_SHA}-Linux-Ubuntu22.04-${gnuArch}.tar.gz \
+  && curl -SfL https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}/EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_VERSION_SHA}-Linux-Ubuntu22.04-${gnuArch}.tar.gz -o energyplus.tar.gz \
+  && curl -SfL https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}/OpenStudio-${OPENSTUDIO_VERSION}+${OPENSTUDIO_VERSION_SHA}-Ubuntu-22.04-${gnuArch}.deb -o openstudio.deb \
+  && curl -SfL https://openstudio-resources.s3.amazonaws.com/bcvtb-linux.tar.gz -o bcvtb.tar.gz
+
+FROM python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} AS dual-python
+
+  ENV PYTHON_VERSION=3.8.19
+  ENV GPG_KEY=E3FF2839C048B25C084DEBE9B26995E310250568
+
+  RUN set -eux; \
+      \
+      savedAptMark="$(apt-mark showmanual)"; \
+      apt-get update; \
+      apt-get install -y --no-install-recommends \
+          dpkg-dev \
+          gcc \
+          gnupg \
+          libbluetooth-dev \
+          libbz2-dev \
+          libc6-dev \
+          libdb-dev \
+          libexpat1-dev \
+          libffi-dev \
+          libgdbm-dev \
+          liblzma-dev \
+          libncursesw5-dev \
+          libreadline-dev \
+          libsqlite3-dev \
+          libssl-dev \
+          make \
+          tk-dev \
+          uuid-dev \
+          wget \
+          xz-utils \
+          zlib1g-dev \
+      ; \
+      \
+      wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz"; \
+      wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc"; \
+      GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
+      gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$GPG_KEY"; \
+      gpg --batch --verify python.tar.xz.asc python.tar.xz; \
+      gpgconf --kill all; \
+      rm -rf "$GNUPGHOME" python.tar.xz.asc; \
+      mkdir -p /usr/src/python; \
+      tar --extract --directory /usr/src/python --strip-components=1 --file python.tar.xz; \
+      rm python.tar.xz; \
+      \
+      cd /usr/src/python; \
+      gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
+      ./configure \
+          --build="$gnuArch" \
+          --enable-loadable-sqlite-extensions \
+          --enable-optimizations \
+          --enable-option-checking=fatal \
+          --enable-shared \
+          --with-system-expat \
+          --without-ensurepip \
+      ; \
+      nproc="$(nproc)"; \
+      EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
+      LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
+      LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \
+      make -j "$nproc" \
+          "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
+          "LDFLAGS=${LDFLAGS:-}" \
+          "PROFILE_TASK=${PROFILE_TASK:-}" \
+      ; \
+  # https://github.com/docker-library/python/issues/784
+  # prevent accidental usage of a system installed libpython of the same version
+      rm python; \
+      make -j "$nproc" \
+          "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \
+          "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \
+          "PROFILE_TASK=${PROFILE_TASK:-}" \
+          python \
+      ; \
+      make altinstall; \
+      \
+      cd /; \
+      rm -rf /usr/src/python; \
+      \
+      find /usr/local -depth \
+          \( \
+              \( -type d -a \( -name test -o -name tests -o -name idle_test \) \) \
+              -o \( -type f -a \( -name '*.pyc' -o -name '*.pyo' -o -name 'libpython*.a' \) \) \
+              -o \( -type f -a -name 'wininst-*.exe' \) \
+          \) -exec rm -rf '{}' + \
+      ; \
+      \
+      ldconfig; \
+      \
+      apt-mark auto '.*' > /dev/null; \
+      apt-mark manual $savedAptMark; \
+      find /usr/local -type f -executable -not \( -name '*tkinter*' \) -exec ldd '{}' ';' \
+          | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+          | sort -u \
+          | xargs -r dpkg-query --search \
+          | cut -d: -f1 \
+          | sort -u \
+          | xargs -r apt-mark manual \
+      ; \
+      apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+      rm -rf /var/lib/apt/lists/*; \
+      \
+      python3.8 --version
+
+  RUN python3.8 -m ensurepip --altinstall
+
+
+FROM dual-python AS alfalfa-dependencies
+
+ENV ENERGYPLUS_DIR=/usr/local/EnergyPlus
+ENV HOME=/alfalfa
+
+WORKDIR /artifacts
+
+# Install EnergyPlus
+RUN --mount=type=bind,from=energyplus-dependencies,source=/artifacts,target=/artifacts set -eux; \
+  mkdir ${ENERGYPLUS_DIR}; \
+  tar -C $ENERGYPLUS_DIR/ --strip-components=1 -xzf energyplus.tar.gz; \
+  cd ${ENERGYPLUS_DIR}; \
+  rm -rf \
+    ExampleFiles \
+    DataSets \
+    Documentation \
+    MacroDataSets \
+    python_standard_lib \
+    WeatherData \
+    libpython3.8.so.1.0 \
+  ; \
+  ln -s $ENERGYPLUS_DIR/energyplus /usr/local/bin/; \
+  ln -s $ENERGYPLUS_DIR/ExpandObjects /usr/local/bin/; \
+  ln -s $ENERGYPLUS_DIR/runenergyplus /usr/local/bin/; \
+  ln -s /usr/local/lib/python3.8 ${ENERGYPLUS_DIR}/python_standard_lib; \
+  ln -s /usr/local/lib/libpython3.8.so.1.0 ${ENERGYPLUS_DIR}/libpython3.8.so.1.0
+
+# Install OpenStudio
+RUN --mount=type=bind,from=energyplus-dependencies,source=/artifacts,target=/artifacts set -eux; \
+  apt-get update; \
+  apt-get install -y --no-install-recommends \
+    gdebi-core \
+    openjdk-17-jre-headless \
+  ; \
+  gdebi -o "APT::Install-Recommends=0" -n openstudio.deb; \
+  cd /usr/local/openstudio*; \
+  rm -rf \
+    EnergyPlus \
+    Examples \
+    *Release_Notes*.pdf \
+  ; \
+  ln -s ${ENERGYPLUS_DIR} EnergyPlus; \
+  apt-get purge -y \
     gdebi-core \
-    openjdk-8-jdk \
-    libgfortran4 \
-    python3-venv \
-    python3-pip \
-    && rm -rf /var/lib/apt/lists/*
+  ; \
+  apt-get autoremove -y; \
+  rm -rf /var/lib/apt/lists/*
+
 
+# Install Assimulo, PyFMI and Old Fortran Libraries
+RUN --mount=type=bind,from=modelica-dependencies,source=/artifacts,target=/artifacts set -eux; \
+  python3.10 -m pip install 'numpy>=1.19.5' 'scipy>=1.10.1' 'matplotlib>3'; \
+  python3.10 -m pip install --no-deps Assimulo*.whl PyFMI*.whl; \
+  pip3 cache purge; \
+  apt-get update; \
+  apt-get install -y --no-install-recommends \
+    gdebi-core \
+    libgfortran5 \
+  ; \
+  gdebi -n gcc-6.deb; \
+  gdebi -n libgfortran3.deb; \
+  gdebi -n gcc-7.deb; \
+  gdebi -n libgfortran4.deb; \
+  apt-get purge -y \
+    gdebi-core \
+  ; \
+  apt-get autoremove -y; \
+  rm -rf /var/lib/apt/lists/*
 
 WORKDIR $HOME
-# Use set in update-alternatives instead of config to
-# provide non-interactive input.
-RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
-    && update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac \
-    && curl -SLO http://openstudio-resources.s3.amazonaws.com/bcvtb-linux.tar.gz \
-    && tar -xzf bcvtb-linux.tar.gz \
-    && rm bcvtb-linux.tar.gz
-
-WORKDIR $BUILD_DIR
-
-ENV OPENSTUDIO_DOWNLOAD_URL https://github.com/NREL/OpenStudio/releases/download/v3.8.0/OpenStudio-3.8.0+f953b6fcaf-Ubuntu-20.04-x86_64.deb
-
-# mlep / external interface needs parts of EnergyPlus that are not included with OpenStudio
-# expandobjects, runenergyplus might be two examples, but the need to install EnergyPlus separately from OpenStudio
-# might be revaluated
-ENV ENERGYPLUS_DIR /usr/local/EnergyPlus
-ENV ENERGYPLUS_DOWNLOAD_URL https://github.com/NREL/EnergyPlus/releases/download/v24.1.0/EnergyPlus-24.1.0-9d7789a3ac-Linux-Ubuntu20.04-x86_64.tar.gz
-
-# We would rather use the self extracting tarball distribution of EnergyPlus, but there appears to
-# be a bug in the installation script so using the tar.gz manually here and making our own links
-RUN curl -SL $ENERGYPLUS_DOWNLOAD_URL -o energyplus.tar.gz\
-    && mkdir $ENERGYPLUS_DIR \
-    && tar -C $ENERGYPLUS_DIR/ --strip-components=1 -xzf energyplus.tar.gz \
-    && ln -s $ENERGYPLUS_DIR/energyplus /usr/local/bin/ \
-    && ln -s $ENERGYPLUS_DIR/ExpandObjects /usr/local/bin/ \
-    && ln -s $ENERGYPLUS_DIR/runenergyplus /usr/local/bin/ \
-    && rm energyplus.tar.gz
-
-RUN curl -SL $OPENSTUDIO_DOWNLOAD_URL -o openstudio.deb\
-    && gdebi -n openstudio.deb \
-    && rm -f openstudio.deb \
-    && cd /usr/local/openstudio* \
-    && rm -rf EnergyPlus \
-    && ln -s $ENERGYPLUS_DIR EnergyPlus
-
-# Install commands for Spawn
-ENV SPAWN_VERSION=0.3.0-69040695f9
-RUN curl -SL https://spawn.s3.amazonaws.com/custom/Spawn-$SPAWN_VERSION-Linux.tar.gz -o spawn.tar.gz \
-    && tar -C /usr/local/ -xzf spawn.tar.gz \
-    && ln -s /usr/local/Spawn-$SPAWN_VERSION-Linux/bin/spawn-$SPAWN_VERSION /usr/local/bin/ \
-    && rm spawn.tar.gz
-
-## MODELICA
-# Modelica requires libgfortran3 which is not in apt for 20.04
-RUN curl -SLO http://archive.ubuntu.com/ubuntu/pool/universe/g/gcc-6/gcc-6-base_6.4.0-17ubuntu1_amd64.deb \
-    && curl -SLO http://archive.ubuntu.com/ubuntu/pool/universe/g/gcc-6/libgfortran3_6.4.0-17ubuntu1_amd64.deb \
-    && dpkg -i gcc-6-base_6.4.0-17ubuntu1_amd64.deb \
-    && dpkg -i libgfortran3_6.4.0-17ubuntu1_amd64.deb \
-    && ln -s /usr/lib/x86_64-linux-gnu/libffi.so.7 /usr/lib/x86_64-linux-gnu/libffi.so.6 \
-    && rm *.deb
-
-COPY requirements.txt $BUILD_DIR
-RUN pip install -r requirements.txt && \
-    rm requirements.txt
-
-# Install Assimulo for PyFMI
-RUN curl -SLO https://github.com/modelon-community/Assimulo/releases/download/Assimulo-3.4.3/Assimulo-3.4.3-cp38-cp38-linux_x86_64.whl \
-    && pip install Assimulo-3.4.3-cp38-cp38-linux_x86_64.whl \
-    && rm Assimulo-3.4.3-cp38-cp38-linux_x86_64.whl
-
-# Install PyFMI
-RUN curl -SLO https://github.com/modelon-community/PyFMI/releases/download/PyFMI-2.11.0/PyFMI-2.11.0-cp38-cp38-linux_x86_64.whl \
-    && pip install PyFMI-2.11.0-cp38-cp38-linux_x86_64.whl \
-    && rm PyFMI-2.11.0-cp38-cp38-linux_x86_64.whl
-
-ENV PYTHONPATH=${PYTHONPATH}:${ENERGYPLUS_DIR}
-
-ENV SEPARATE_PROCESS_JVM /usr/lib/jvm/java-8-openjdk-amd64/
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
+
+# Only the xml lib component of bcvtb is actaully required for communication, so we just extract that to save space
+RUN --mount=type=bind,from=energyplus-dependencies,source=/artifacts,target=/artifacts tar -xzf /artifacts/bcvtb.tar.gz bcvtb/lib/xml