diff --git a/Makefile b/Makefile
index beae9a0447a7db6ca0c88c8a3a57df0f99c6cfc0..c496c4e51cd8fa45c99599b11369d513d2a3306f 100644
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,17 @@ ko-local:
 		--tags $(GIT_VERSION) --tags $(GIT_HASH) --local \
 		github.com/sigstore/rekor/cmd/rekor-cli
 
+# This builds the trillian containers we rely on using ko for cross platform support
+.PHONY: ko-trillian
+ko-trillian:
+	LDFLAGS="$(SERVER_LDFLAGS)" GIT_HASH=$(GIT_HASH) GIT_VERSION=$(GIT_VERSION) \
+	ko publish --base-import-paths --bare \
+		--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
+		github.com/google/trillian/cmd/trillian_log_signer
+	ko publish --base-import-paths --bare \
+		--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
+		github.com/google/trillian/cmd/trillian_log_server
+
 
 ## --------------------------------------
 ## Tooling Binaries
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ec602a4175135baa06018526b10f06374eb9db3..d436c92b7f09e5990e44aaf8da3e783ad58a0075 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@
 version: '3.4'
 services:
   mysql:
+    platform: linux/amd64
     image: gcr.io/trillian-opensource-ci/db_server:v1.4.0
     environment:
       - MYSQL_ROOT_PASSWORD=zaphod
@@ -45,7 +46,7 @@ services:
       retries: 3
       start_period: 5s
   trillian-log-server:
-    image: gcr.io/trillian-opensource-ci/log_server:v1.4.0
+    image: gcr.io/projectsigstore/trillian_log_server@sha256:f850a0defd089ea844822030c67ae05bc93c91168a7dd4aceb0b6648c39f696b
     command: [
       "--storage_system=mysql",
       "--mysql_uri=test:zaphod@tcp(mysql:3306)/test",
@@ -60,7 +61,7 @@ services:
     depends_on:
       - mysql
   trillian-log-signer:
-    image: gcr.io/trillian-opensource-ci/log_signer:v1.4.0
+    image: gcr.io/projectsigstore/trillian_log_signer@sha256:fe90d523f6617974f70878918e4b31d49b2b46a86024bb2d6b01d2bbfed8edbf
     command: [
       "--storage_system=mysql",
       "--mysql_uri=test:zaphod@tcp(mysql:3306)/test",
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
index 9eed603ab0260848cd9100d19c427f4be942b365..24561b81f58e566407bb9cf6e0eb0af96f39e66a 100644
--- a/hack/tools/tools.go
+++ b/hack/tools/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright 2021 The Sigstore Authors.
@@ -24,4 +25,8 @@ import (
 	_ "github.com/dvyukov/go-fuzz/go-fuzz-build"
 	_ "github.com/dvyukov/go-fuzz/go-fuzz-dep"
 	_ "github.com/go-swagger/go-swagger/cmd/swagger"
+
+	// These are so we can build these two binaries into containers with ko
+	_ "github.com/google/trillian/cmd/trillian_log_server"
+	_ "github.com/google/trillian/cmd/trillian_log_signer"
 )