diff --git a/tools/packaging/static-build/coco-guest-components/Dockerfile b/tools/packaging/static-build/coco-guest-components/Dockerfile
index 57a3ce6c60..4d533428d9 100644
--- a/tools/packaging/static-build/coco-guest-components/Dockerfile
+++ b/tools/packaging/static-build/coco-guest-components/Dockerfile
@@ -1,4 +1,5 @@
 # Copyright (c) 2024 Intel
+# Copyright (c) 2024 IBM Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -7,35 +8,33 @@ ARG RUST_TOOLCHAIN
 
 ENV DEBIAN_FRONTEND=noninteractive
 
+# Note - the TDX lib is only available on x86, so there is an arch check in the package install
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN apt-get update && \
 	apt-get --no-install-recommends install -y \
-		ca-certificates \
-		curl \
-		gnupg && \
-		apt-get clean && rm -rf /var/lib/apt/lists/
-RUN if [ "$(uname -m)" == "x86_64" ]; then curl -sL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \
-		echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
-		apt-get update && \
-		apt-get --no-install-recommends -y install libtdx-attest-dev && \
-		apt-get clean && rm -rf /var/lib/apt/lists/; fi
-RUN apt-get update && \
+	ca-certificates \
+	curl \
+	gnupg && \
+	if [ "$(uname -m)" == "x86_64" ]; then curl -sL https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | gpg --dearmor --output /usr/share/keyrings/intel-sgx.gpg && \
+	echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-sgx.gpg] https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main' | tee /etc/apt/sources.list.d/intel-sgx.list && \
+	apt-get update && \
+	apt-get --no-install-recommends -y install libtdx-attest-dev; fi && \
 	apt-get --no-install-recommends -y install \
-		binutils \
-		clang \
-		g++ \
-		gcc \
-		git \
-		libssl-dev \
-		libtss2-dev \
-		make \
-		musl-tools \
-		openssl \
-		perl \
-		pkg-config \
-		protobuf-compiler && \
+	binutils \
+	clang \
+	g++ \
+	gcc \
+	git \
+	libssl-dev \
+	libtss2-dev \
+	make \
+	musl-tools \
+	openssl \
+	perl \
+	pkg-config \
+	protobuf-compiler && \
 	apt-get clean && rm -rf /var/lib/apt/lists/ && \
-    	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_TOOLCHAIN}
+	curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${RUST_TOOLCHAIN}
 
 # aarch64 requires this name -- link for all
 RUN ln -s /usr/bin/musl-gcc "/usr/bin/$(uname -m)-linux-musl-gcc"
diff --git a/tools/packaging/static-build/coco-guest-components/build.sh b/tools/packaging/static-build/coco-guest-components/build.sh
index f46ea52322..96171f0808 100755
--- a/tools/packaging/static-build/coco-guest-components/build.sh
+++ b/tools/packaging/static-build/coco-guest-components/build.sh
@@ -38,10 +38,19 @@ sudo docker pull ${container_image} || \
 	 # No-op unless PUSH_TO_REGISTRY is exported as "yes"
 	 push_to_registry "${container_image}")
 
+# Temp settings until we have a matching TEE_PLATFORM
+TEE_PLATFORM=""
+RESOURCE_PROVIDER="kbs,sev"
+ATTESTER="none"
+# snp-attester and tdx-attester crates require packages only available on x86
+[ "$(uname -m)" == "x86_64" ] && ATTESTER="snp-attester,tdx-attester"
+
 sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
 	-w "${PWD}" \
 	--env DESTDIR="${DESTDIR}" \
-	--env TEE_PLATFORM=${TEE_PLATFORM:-all} \
+	--env TEE_PLATFORM=${TEE_PLATFORM:+"all"} \
+	--env RESOURCE_PROVIDER=${RESOURCE_PROVIDER:-} \
+	--env ATTESTER=${ATTESTER:-} \
 	--env coco_guest_components_repo="${coco_guest_components_repo}" \
 	--env coco_guest_components_version="${coco_guest_components_version}" \
 	"${container_image}" \