diff --git a/Dockerfile b/Dockerfile
index 47c1fbf..9993a0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -105,10 +105,9 @@ RUN apt-get update \
 WORKDIR /artifacts
 
 RUN set -eux; \
-  export gnuArch=x86_64; if [ "$(uname -m)" = "aarch64" ]; then gnuArch=arm64; fi; export gnuArch \
-  && curl -SfL https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}a/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
+  export gnuArch=x86_64; if [ "$(uname -m)" = "aarch64" ]; then gnuArch=arm64; fi; export gnuArch; \
+  curl -SfL https://github.com/NREL/EnergyPlus/releases/download/v${ENERGYPLUS_VERSION}a/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
 
 RUN set -eux; \
   mkdir -p EnergyPlus; \
@@ -188,7 +187,5 @@ RUN --mount=type=bind,from=modelica-dependencies,source=/artifacts,target=/artif
   apt-get autoremove -y; \
   rm -rf /var/lib/apt/lists/*
 
+ENV PYTHONPATH="${ENERGYPLUS_DIR}:${PYTHONPATH}"
 WORKDIR $HOME
-
-# 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