diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 094e0fb..6e4009c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -77,7 +77,6 @@ jobs:
         push: true
         target: production
         tags: ${{ steps.meta.outputs.tags }}
-        build-args: LUSTRE_VERSION=cray-2.15.B19
 
     - name: "Build the final Docker image in nektos/act"
       # The docker/build-push-action does actions/checkout, and that can't be
@@ -153,7 +152,6 @@ jobs:
         push: true
         target: debug
         tags: ${{ steps.meta.outputs.tags }}
-        build-args: LUSTRE_VERSION=cray-2.15.B19
 
   create_release:
     needs: production
diff --git a/Dockerfile b/Dockerfile
index e979063..6e33e1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,8 @@ ARG MPI_OPERATOR_VERSION=0.6.0
 # See https://www.open-mpi.org/software/ompi/v4.1/ for releases and their checksums.
 ARG OPENMPI_VERSION=4.1.7
 ARG OPENMPI_MD5=787d2bc8b3db336db97c34236934b3df
+# Default to the latest cray 2.15 release
+ARG LUSTRE_VERSION=cray-2.15.B19
 
 FROM mpioperator/openmpi-builder:v$MPI_OPERATOR_VERSION AS builder
 
diff --git a/Makefile b/Makefile
index e8fc5d5..f8d6ea7 100644
--- a/Makefile
+++ b/Makefile
@@ -24,25 +24,16 @@ IMAGE_TAG_BASE ?= ghcr.io/nearnodeflash/nnf-mfu
 # tools. (i.e. podman)
 CONTAINER_TOOL ?= docker
 
-# Which tag to pull from the cray lustre source code.
-# **Note:** This must also be set in .github/workflows/main.yaml for both
-# production and debug docker builds.
-CRAY_LUSTRE_VERSION ?= cray-2.15.B19
-
-# Only support linux/amd64 builds. This reduces complexity with installing
-# lustre, which is an option enabled for mpifileutils.
-PLATFORM ?= linux/amd64
-
 docker-build: VERSION ?= $(shell cat .version)
 docker-build: TARGET ?= production
 docker-build: .version
-	${CONTAINER_TOOL} build --platform=$(PLATFORM) --target $(TARGET) --build-arg LUSTRE_VERSION=${CRAY_LUSTRE_VERSION} -t $(IMAGE_TAG_BASE):$(VERSION) .
+	${CONTAINER_TOOL} build --target $(TARGET) -t $(IMAGE_TAG_BASE):$(VERSION) .
 
 docker-build-debug: VERSION ?= $(shell cat .version)
 docker-build-debug: TARGET ?= debug
 docker-build-debug: IMAGE_TAG_BASE := $(IMAGE_TAG_BASE)-debug
 docker-build-debug: .version
-	${CONTAINER_TOOL} build --platform=$(PLATFORM) --target $(TARGET) --build-arg LUSTRE_VERSION=${CRAY_LUSTRE_VERSION} -t $(IMAGE_TAG_BASE):$(VERSION) .
+	${CONTAINER_TOOL} build --target $(TARGET) -t $(IMAGE_TAG_BASE):$(VERSION) .
 
 docker-push: VERSION ?= $(shell cat .version)
 docker-push: .version