From 9324bee6e531356c27551ace3fbbd80858fd8faa Mon Sep 17 00:00:00 2001
From: Charlie Briggs <charliebriggs@gmail.com>
Date: Thu, 11 Jan 2024 11:59:24 +0000
Subject: [PATCH 1/2] Add arm64 support

---
 .circleci/config.yml | 2 +-
 Dockerfile.template  | 3 ++-
 manifest             | 2 ++
 shared               | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39e87c7..9d9f048 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  cimg: circleci/cimg@0.3.0
+  cimg: circleci/cimg@0.3.3
 
 workflows:
   main-wf:
diff --git a/Dockerfile.template b/Dockerfile.template
index 5ca3230..45c7201 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -27,6 +27,7 @@ RUN mkdir -p $HOME/bin && \
 
 # Install tooling
 ENV BABASHKA_VERSION=0.10.163
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-amd64-static.tar.gz" \
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/manifest b/manifest
index 2a083bb..85dfb97 100644
--- a/manifest
+++ b/manifest
@@ -7,3 +7,5 @@ variants=(node browsers)
 parentTags=(8.0 11.0 17.0)
 defaultParentTag=17.0
 parentSlug=openjdk
+
+arm64=1
diff --git a/shared b/shared
index cdab031..59ebf05 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit cdab031cf829da3be5f6d55bd9881f0d0e6da7ca
+Subproject commit 59ebf05450832397e3c6b5eaf1dc12671d7ffd72

From 0c7e0d1a3c9bd41a42af939cafe9c2cc9b369b71 Mon Sep 17 00:00:00 2001
From: Charlie Briggs <charliebriggs@gmail.com>
Date: Thu, 11 Jan 2024 12:09:28 +0000
Subject: [PATCH 2/2] Update images for arm

---
 1.10/11.0/Dockerfile          | 14 ++++++++------
 1.10/11.0/browsers/Dockerfile | 20 ++++++++++----------
 1.10/11.0/node/Dockerfile     |  5 +++--
 1.10/17.0/Dockerfile          | 14 ++++++++------
 1.10/17.0/browsers/Dockerfile | 20 ++++++++++----------
 1.10/17.0/node/Dockerfile     |  5 +++--
 1.10/8.0/Dockerfile           | 14 ++++++++------
 1.10/8.0/browsers/Dockerfile  | 20 ++++++++++----------
 1.10/8.0/node/Dockerfile      |  5 +++--
 1.11/11.0/Dockerfile          |  7 ++++---
 1.11/11.0/node/Dockerfile     |  5 +++--
 1.11/17.0/Dockerfile          |  7 ++++---
 1.11/17.0/node/Dockerfile     |  5 +++--
 1.11/8.0/Dockerfile           |  7 ++++---
 1.11/8.0/node/Dockerfile      |  5 +++--
 build-images.sh               | 21 ++++++++++++---------
 push-images.sh                | 31 +------------------------------
 17 files changed, 97 insertions(+), 108 deletions(-)

diff --git a/1.10/11.0/Dockerfile b/1.10/11.0/Dockerfile
index 52c1418..7126fae 100644
--- a/1.10/11.0/Dockerfile
+++ b/1.10/11.0/Dockerfile
@@ -2,19 +2,20 @@
 
 FROM cimg/openjdk:11.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
-ENV CLOJURE_VERSION=1.10.3
+ENV CLOJURE_VERSION=1.10.3 \
+	PATH=$JAVA_HOME/bin:$PATH
 
 # Setup the primary install method for Clojure, using CLJ. It unfortunately
 # requires the Clojure version as well as the build number (?), thus a
 # parameter (param1) is used.
-RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1069.sh" && \
+RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1058.sh" && \
 	chmod +x clojure-installer.sh && \
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -25,7 +26,8 @@ RUN mkdir -p $HOME/bin && \
 	rm -r project.clj target/
 
 # Install tooling
-ENV BABASHKA_VERSION=0.9.161
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v0.7.4/babashka-0.7.4-linux-amd64-static.tar.gz" \
+ENV BABASHKA_VERSION=0.10.163
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.10/11.0/browsers/Dockerfile b/1.10/11.0/browsers/Dockerfile
index 9c42dd5..cb2b6ab 100644
--- a/1.10/11.0/browsers/Dockerfile
+++ b/1.10/11.0/browsers/Dockerfile
@@ -11,6 +11,9 @@ RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://seleniu
     rm selenium-server-standalone-${SELENIUM_VER}.jar
 
 RUN sudo apt-get update && \
+	sudo apt-get install --yes --no-install-recommends \
+		xvfb \
+	&& \
 
     # Install Java only if it's not already available
     # Java is installed for Selenium
@@ -32,25 +35,22 @@ RUN	printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo te
 	sudo chmod +x /docker-entrypoint.sh
 
 # Install a single version of Firefox. This isn't intended to be a regularly
-# updated thing. Instead, if this version of Firefox isn't want the end user
+# updated thing. Instead, if this version of Firefox isn't what the end user
 # wants they should install a different version via the Browser Tools Orb.
 #
 # Canonical made a major technology change in how Firefox is installed from
 # Ubuntu 21.10 and up. The general CI space doesn't seem to be ready for a snap
-# based Firefox right now so we are installing the original deb based version
-# from Ubuntu Focal, even if the current Ubuntu version is newer.
-RUN echo 'deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main' | sudo tee /etc/apt/sources.list.d/firefox.list && \
-	echo 'Package: firefox' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin: release n=focal' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin-Priority: 500' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-
-	sudo apt-get update && \
+# based Firefox right now so we are installing it from the Mozilla PPA.
+RUN echo 'Package: *' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin: release o=LP-PPA-mozillateam' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin-Priority: 1001' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	sudo add-apt-repository --yes ppa:mozillateam/ppa && \
 	sudo apt-get install --no-install-recommends --yes firefox && \
 	sudo rm -rf /var/lib/apt/lists/* && \
 	firefox --version
 
 # Install a single version of Google Chrome Stable. This isn't intended to be a
-# regularly updated thing. Instead, if this version of Chrome isn't want the
+# regularly updated thing. Instead, if this version of Chrome isn't what the
 # end user wants they should install a different version via the Browser Tools
 # Orb.
 RUN wget -q -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - && \
diff --git a/1.10/11.0/node/Dockerfile b/1.10/11.0/node/Dockerfile
index 758babb..e9489e6 100644
--- a/1.10/11.0/node/Dockerfile
+++ b/1.10/11.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/1.10/17.0/Dockerfile b/1.10/17.0/Dockerfile
index 724635f..9d56373 100644
--- a/1.10/17.0/Dockerfile
+++ b/1.10/17.0/Dockerfile
@@ -2,19 +2,20 @@
 
 FROM cimg/openjdk:17.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
-ENV CLOJURE_VERSION=1.10.3
+ENV CLOJURE_VERSION=1.10.3 \
+	PATH=$JAVA_HOME/bin:$PATH
 
 # Setup the primary install method for Clojure, using CLJ. It unfortunately
 # requires the Clojure version as well as the build number (?), thus a
 # parameter (param1) is used.
-RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1069.sh" && \
+RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1058.sh" && \
 	chmod +x clojure-installer.sh && \
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -25,7 +26,8 @@ RUN mkdir -p $HOME/bin && \
 	rm -r project.clj target/
 
 # Install tooling
-ENV BABASHKA_VERSION=0.9.161
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v0.7.4/babashka-0.7.4-linux-amd64-static.tar.gz" \
+ENV BABASHKA_VERSION=0.10.163
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.10/17.0/browsers/Dockerfile b/1.10/17.0/browsers/Dockerfile
index b9096bc..7a6193e 100644
--- a/1.10/17.0/browsers/Dockerfile
+++ b/1.10/17.0/browsers/Dockerfile
@@ -11,6 +11,9 @@ RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://seleniu
     rm selenium-server-standalone-${SELENIUM_VER}.jar
 
 RUN sudo apt-get update && \
+	sudo apt-get install --yes --no-install-recommends \
+		xvfb \
+	&& \
 
     # Install Java only if it's not already available
     # Java is installed for Selenium
@@ -32,25 +35,22 @@ RUN	printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo te
 	sudo chmod +x /docker-entrypoint.sh
 
 # Install a single version of Firefox. This isn't intended to be a regularly
-# updated thing. Instead, if this version of Firefox isn't want the end user
+# updated thing. Instead, if this version of Firefox isn't what the end user
 # wants they should install a different version via the Browser Tools Orb.
 #
 # Canonical made a major technology change in how Firefox is installed from
 # Ubuntu 21.10 and up. The general CI space doesn't seem to be ready for a snap
-# based Firefox right now so we are installing the original deb based version
-# from Ubuntu Focal, even if the current Ubuntu version is newer.
-RUN echo 'deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main' | sudo tee /etc/apt/sources.list.d/firefox.list && \
-	echo 'Package: firefox' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin: release n=focal' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin-Priority: 500' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-
-	sudo apt-get update && \
+# based Firefox right now so we are installing it from the Mozilla PPA.
+RUN echo 'Package: *' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin: release o=LP-PPA-mozillateam' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin-Priority: 1001' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	sudo add-apt-repository --yes ppa:mozillateam/ppa && \
 	sudo apt-get install --no-install-recommends --yes firefox && \
 	sudo rm -rf /var/lib/apt/lists/* && \
 	firefox --version
 
 # Install a single version of Google Chrome Stable. This isn't intended to be a
-# regularly updated thing. Instead, if this version of Chrome isn't want the
+# regularly updated thing. Instead, if this version of Chrome isn't what the
 # end user wants they should install a different version via the Browser Tools
 # Orb.
 RUN wget -q -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - && \
diff --git a/1.10/17.0/node/Dockerfile b/1.10/17.0/node/Dockerfile
index a3735ff..d9f1d41 100644
--- a/1.10/17.0/node/Dockerfile
+++ b/1.10/17.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/1.10/8.0/Dockerfile b/1.10/8.0/Dockerfile
index 19ae4c4..5f82a9b 100644
--- a/1.10/8.0/Dockerfile
+++ b/1.10/8.0/Dockerfile
@@ -2,19 +2,20 @@
 
 FROM cimg/openjdk:8.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
-ENV CLOJURE_VERSION=1.10.3
+ENV CLOJURE_VERSION=1.10.3 \
+	PATH=$JAVA_HOME/bin:$PATH
 
 # Setup the primary install method for Clojure, using CLJ. It unfortunately
 # requires the Clojure version as well as the build number (?), thus a
 # parameter (param1) is used.
-RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1069.sh" && \
+RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linux-install-1.10.3.1058.sh" && \
 	chmod +x clojure-installer.sh && \
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -25,7 +26,8 @@ RUN mkdir -p $HOME/bin && \
 	rm -r project.clj target/
 
 # Install tooling
-ENV BABASHKA_VERSION=0.9.161
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v0.7.4/babashka-0.7.4-linux-amd64-static.tar.gz" \
+ENV BABASHKA_VERSION=0.10.163
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.10/8.0/browsers/Dockerfile b/1.10/8.0/browsers/Dockerfile
index b3a693c..caca657 100644
--- a/1.10/8.0/browsers/Dockerfile
+++ b/1.10/8.0/browsers/Dockerfile
@@ -11,6 +11,9 @@ RUN curl -sSL -o selenium-server-standalone-${SELENIUM_VER}.jar "https://seleniu
     rm selenium-server-standalone-${SELENIUM_VER}.jar
 
 RUN sudo apt-get update && \
+	sudo apt-get install --yes --no-install-recommends \
+		xvfb \
+	&& \
 
     # Install Java only if it's not already available
     # Java is installed for Selenium
@@ -32,25 +35,22 @@ RUN	printf '#!/bin/sh\nXvfb :99 -screen 0 1280x1024x24 &\nexec "$@"\n' | sudo te
 	sudo chmod +x /docker-entrypoint.sh
 
 # Install a single version of Firefox. This isn't intended to be a regularly
-# updated thing. Instead, if this version of Firefox isn't want the end user
+# updated thing. Instead, if this version of Firefox isn't what the end user
 # wants they should install a different version via the Browser Tools Orb.
 #
 # Canonical made a major technology change in how Firefox is installed from
 # Ubuntu 21.10 and up. The general CI space doesn't seem to be ready for a snap
-# based Firefox right now so we are installing the original deb based version
-# from Ubuntu Focal, even if the current Ubuntu version is newer.
-RUN echo 'deb http://us.archive.ubuntu.com/ubuntu/ focal-updates main' | sudo tee /etc/apt/sources.list.d/firefox.list && \
-	echo 'Package: firefox' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin: release n=focal' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-	echo 'Pin-Priority: 500' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
-
-	sudo apt-get update && \
+# based Firefox right now so we are installing it from the Mozilla PPA.
+RUN echo 'Package: *' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin: release o=LP-PPA-mozillateam' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	echo 'Pin-Priority: 1001' | sudo tee -a /etc/apt/preferences.d/firefox.pref && \
+	sudo add-apt-repository --yes ppa:mozillateam/ppa && \
 	sudo apt-get install --no-install-recommends --yes firefox && \
 	sudo rm -rf /var/lib/apt/lists/* && \
 	firefox --version
 
 # Install a single version of Google Chrome Stable. This isn't intended to be a
-# regularly updated thing. Instead, if this version of Chrome isn't want the
+# regularly updated thing. Instead, if this version of Chrome isn't what the
 # end user wants they should install a different version via the Browser Tools
 # Orb.
 RUN wget -q -O - "https://dl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - && \
diff --git a/1.10/8.0/node/Dockerfile b/1.10/8.0/node/Dockerfile
index eb69817..8739280 100644
--- a/1.10/8.0/node/Dockerfile
+++ b/1.10/8.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/1.11/11.0/Dockerfile b/1.11/11.0/Dockerfile
index 5765abb..71229b7 100644
--- a/1.11/11.0/Dockerfile
+++ b/1.11/11.0/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM cimg/openjdk:11.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
 ENV CLOJURE_VERSION=1.11.1 \
 	PATH=$JAVA_HOME/bin:$PATH
@@ -15,7 +15,7 @@ RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linu
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -27,6 +27,7 @@ RUN mkdir -p $HOME/bin && \
 
 # Install tooling
 ENV BABASHKA_VERSION=0.10.163
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-amd64-static.tar.gz" \
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.11/11.0/node/Dockerfile b/1.11/11.0/node/Dockerfile
index 5d59ada..70923f4 100644
--- a/1.11/11.0/node/Dockerfile
+++ b/1.11/11.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/1.11/17.0/Dockerfile b/1.11/17.0/Dockerfile
index 8595e97..5e80ea3 100644
--- a/1.11/17.0/Dockerfile
+++ b/1.11/17.0/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM cimg/openjdk:17.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
 ENV CLOJURE_VERSION=1.11.1 \
 	PATH=$JAVA_HOME/bin:$PATH
@@ -15,7 +15,7 @@ RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linu
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -27,6 +27,7 @@ RUN mkdir -p $HOME/bin && \
 
 # Install tooling
 ENV BABASHKA_VERSION=0.10.163
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-amd64-static.tar.gz" \
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.11/17.0/node/Dockerfile b/1.11/17.0/node/Dockerfile
index 646771f..6ab3cfe 100644
--- a/1.11/17.0/node/Dockerfile
+++ b/1.11/17.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/1.11/8.0/Dockerfile b/1.11/8.0/Dockerfile
index c245550..6fb5e45 100644
--- a/1.11/8.0/Dockerfile
+++ b/1.11/8.0/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM cimg/openjdk:8.0
 
-LABEL maintainer="Community & Partner Engineering Team <community-partner@circleci.com>"
+LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"
 
 ENV CLOJURE_VERSION=1.11.1 \
 	PATH=$JAVA_HOME/bin:$PATH
@@ -15,7 +15,7 @@ RUN curl -sSL -o clojure-installer.sh "https://download.clojure.org/install/linu
 	sudo ./clojure-installer.sh && \
 	rm clojure-installer.sh
 
-ENV LEIN_VERSION=2.9.10
+ENV LEIN_VERSION=2.10.0
 RUN mkdir -p $HOME/bin && \
 	# the above line can go in the next base image update
 	curl -sSL -o $HOME/bin/lein "https://raw.githubusercontent.com/technomancy/leiningen/${LEIN_VERSION}/bin/lein" && \
@@ -27,6 +27,7 @@ RUN mkdir -p $HOME/bin && \
 
 # Install tooling
 ENV BABASHKA_VERSION=0.10.163
-RUN curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-amd64-static.tar.gz" \
+RUN [[ $(uname -m) == "x86_64" ]] && ARCH="amd64" || ARCH="aarch64" && \
+	curl -sSL "https://github.com/babashka/babashka/releases/download/v${BABASHKA_VERSION}/babashka-${BABASHKA_VERSION}-linux-${ARCH}-static.tar.gz" \
 	| sudo tar -xz -C /usr/local/bin/ && \
 	bb --version
diff --git a/1.11/8.0/node/Dockerfile b/1.11/8.0/node/Dockerfile
index c5e8559..e212955 100644
--- a/1.11/8.0/node/Dockerfile
+++ b/1.11/8.0/node/Dockerfile
@@ -7,12 +7,13 @@ LABEL maintainer="Community & Partner Engineering Team <community-partner@circle
 # Dockerfile will pull the latest LTS release from cimg-node.
 RUN curl -sSL "https://raw.githubusercontent.com/CircleCI-Public/cimg-node/main/ALIASES" -o nodeAliases.txt && \
 	NODE_VERSION=$(grep "lts" ./nodeAliases.txt | cut -d "=" -f 2-) && \
-	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	[[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \
+	curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \
 	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
 	rm node.tar.xz nodeAliases.txt && \
 	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
 
-ENV YARN_VERSION 1.22.18
+ENV YARN_VERSION 1.22.19
 RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
diff --git a/build-images.sh b/build-images.sh
index 2be6d70..f9d11ea 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
 # Do not edit by hand; please use build scripts/templates to make changes
+set -eo pipefail
 
-docker build --file 1.11/8.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0 -t cimg/clojure:1.11-openjdk-8.0 .
-docker build --file 1.11/8.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0-node -t cimg/clojure:1.11-openjdk-8.0-node .
-docker build --file 1.11/8.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0-browsers -t cimg/clojure:1.11-openjdk-8.0-browsers .
-docker build --file 1.11/11.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0 -t cimg/clojure:1.11-openjdk-11.0 .
-docker build --file 1.11/11.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0-node -t cimg/clojure:1.11-openjdk-11.0-node .
-docker build --file 1.11/11.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0-browsers -t cimg/clojure:1.11-openjdk-11.0-browsers .
-docker build --file 1.11/17.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0 -t cimg/clojure:1.11-openjdk-17.0 .
-docker build --file 1.11/17.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0-node -t cimg/clojure:1.11-openjdk-17.0-node .
-docker build --file 1.11/17.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0-browsers -t cimg/clojure:1.11-openjdk-17.0-browsers .
+docker context create cimg
+docker buildx create --use cimg
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/8.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0 -t cimg/clojure:1.11-openjdk-8.0 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/8.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0-node -t cimg/clojure:1.11-openjdk-8.0-node --push .
+docker buildx build --platform=linux/amd64 --file 1.11/8.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-8.0-browsers -t cimg/clojure:1.11-openjdk-8.0-browsers --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/11.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0 -t cimg/clojure:1.11-openjdk-11.0 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/11.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0-node -t cimg/clojure:1.11-openjdk-11.0-node --push .
+docker buildx build --platform=linux/amd64 --file 1.11/11.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-11.0-browsers -t cimg/clojure:1.11-openjdk-11.0-browsers --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/17.0/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0 -t cimg/clojure:1.11-openjdk-17.0 --push .
+docker buildx build --platform=linux/amd64,linux/arm64 --file 1.11/17.0/node/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0-node -t cimg/clojure:1.11-openjdk-17.0-node --push .
+docker buildx build --platform=linux/amd64 --file 1.11/17.0/browsers/Dockerfile -t cimg/clojure:1.11.1-openjdk-17.0-browsers -t cimg/clojure:1.11-openjdk-17.0-browsers --push .
diff --git a/push-images.sh b/push-images.sh
index c64bbc3..069949d 100755
--- a/push-images.sh
+++ b/push-images.sh
@@ -1,32 +1,3 @@
 #!/usr/bin/env bash
 # Do not edit by hand; please use build scripts/templates to make changes
-docker push cimg/clojure:1.11-openjdk-8.0
-docker push cimg/clojure:1.11.1-openjdk-8.0
-docker push cimg/clojure:1.11-openjdk-8.0-node
-docker push cimg/clojure:1.11.1-openjdk-8.0-node
-docker push cimg/clojure:1.11-openjdk-8.0-browsers
-docker push cimg/clojure:1.11.1-openjdk-8.0-browsers
-docker push cimg/clojure:1.11-openjdk-11.0
-docker push cimg/clojure:1.11.1-openjdk-11.0
-docker push cimg/clojure:1.11-openjdk-11.0-node
-docker push cimg/clojure:1.11.1-openjdk-11.0-node
-docker push cimg/clojure:1.11-openjdk-11.0-browsers
-docker push cimg/clojure:1.11.1-openjdk-11.0-browsers
-docker push cimg/clojure:1.11-openjdk-17.0
-docker push cimg/clojure:1.11.1-openjdk-17.0
-docker tag cimg/clojure:1.11.1-openjdk-17.0 cimg/clojure:1.11.1
-docker tag cimg/clojure:1.11-openjdk-17.0 cimg/clojure:1.11
-docker push cimg/clojure:1.11
-docker push cimg/clojure:1.11.1
-docker push cimg/clojure:1.11-openjdk-17.0-node
-docker push cimg/clojure:1.11.1-openjdk-17.0-node
-docker tag cimg/clojure:1.11.1-openjdk-17.0-node cimg/clojure:1.11.1-node
-docker tag cimg/clojure:1.11-openjdk-17.0-node cimg/clojure:1.11-node
-docker push cimg/clojure:1.11-node
-docker push cimg/clojure:1.11.1-node
-docker push cimg/clojure:1.11-openjdk-17.0-browsers
-docker push cimg/clojure:1.11.1-openjdk-17.0-browsers
-docker tag cimg/clojure:1.11.1-openjdk-17.0-browsers cimg/clojure:1.11.1-browsers
-docker tag cimg/clojure:1.11-openjdk-17.0-browsers cimg/clojure:1.11-browsers
-docker push cimg/clojure:1.11-browsers
-docker push cimg/clojure:1.11.1-browsers
+set -eo pipefail