diff --git a/containers/buildbot-linux/Dockerfile b/containers/buildbot-linux/Dockerfile
index f2154c2..a016f94 100644
--- a/containers/buildbot-linux/Dockerfile
+++ b/containers/buildbot-linux/Dockerfile
@@ -1,5 +1,8 @@
 FROM ubuntu:latest
 
+# Make sure apt-get doesn't try to prompt for stuff like our time zone, etc.
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN echo 'intall packages'; \
     apt-get update; \
     apt-get upgrade; \
@@ -15,6 +18,8 @@ RUN echo 'intall packages'; \
         python3 python3-psutil python3-pip python3-setuptools \
         lsb-release software-properties-common \
         swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \
+        # for libc++ tests that use the timezone database of the chrono header
+        tzdata \
         # for llvm installation script
         sudo \
         # build scripts
@@ -66,18 +71,19 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
+COPY *.sh /usr/local/bin/
+RUN chmod og+rx /usr/local/bin/*.sh
+
 RUN pip3 install buildbot-worker==2.8.4
 
 VOLUME /build
-# WORKDIR /build
 
 RUN groupadd -g 121 runner \
     && useradd -mr -d /home/runner -u 1001 -g 121 runner \
     && mkdir -p /build \
     && chown -R runner:runner /build;
 
-COPY *.sh /usr/local/bin/
-RUN chmod og+rx /usr/local/bin/*.sh
+
 
 ENTRYPOINT ["entrypoint.sh"]
 CMD ["gosu", "runner", "sleep", "infinity"]
diff --git a/containers/buildkite-linux/Dockerfile b/containers/buildkite-linux/Dockerfile
index 6ed5e44..fd9e56a 100644
--- a/containers/buildkite-linux/Dockerfile
+++ b/containers/buildkite-linux/Dockerfile
@@ -1,11 +1,14 @@
 FROM ubuntu:latest
 
+# Make sure apt-get doesn't try to prompt for stuff like our time zone, etc.
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN echo 'intall packages'; \
     apt-get update; \
     apt-get upgrade; \
     apt-get install -y --no-install-recommends \
-        gosu \
-        locales openssh-client gnupg ca-certificates  \
+        gosu tini \
+        locales openssh-client gnupg ca-certificates apt-transport-https \
         zip wget curl git \
         gdb build-essential  \
         ninja-build \
@@ -15,12 +18,14 @@ RUN echo 'intall packages'; \
         python3 python3-psutil python3-pip python3-setuptools \
         lsb-release software-properties-common \
         swig python3-dev libedit-dev libncurses5-dev libxml2-dev liblzma-dev golang rsync jq \
+        # for libc++ tests that use the timezone database of the chrono header
+        tzdata \
         # for llvm installation script
         sudo \
         # build scripts
         nodejs ccache \
-	# shell users
-	less vim
+        # shell users
+        less vim
 
 # Install cmake 3.23+ from source.
 RUN wget --no-verbose -O /cmake.sh https://github.com/Kitware/CMake/releases/download/v3.23.3/cmake-3.23.3-linux-x86_64.sh; \
@@ -66,6 +71,8 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
+COPY *.sh /usr/local/bin/
+RUN chmod og+rx /usr/local/bin/*.sh
 
 RUN echo 'install buildkite' ;\
     apt-get install -y apt-transport-https gnupg;\
@@ -75,10 +82,8 @@ RUN echo 'install buildkite' ;\
     apt-get install -y buildkite-agent tini gosu; \
     apt-get clean;
 
-COPY *.sh /usr/local/bin/
-RUN chmod og+rx /usr/local/bin/*.sh
+
 COPY --chown=buildkite-agent:buildkite-agent pre-checkout /etc/buildkite-agent/hooks
-# COPY --chown=buildkite-agent:buildkite-agent post-checkout /etc/buildkite-agent/hooks
 
 # buildkite working directory
 VOLUME /var/lib/buildkite-agent