diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6309ea8f..e149a635 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,7 @@
 # - ./scripts/ci/build-frontend
 
 FROM nginxproxymanager/testca AS testca
-FROM letsencrypt/pebble AS pebbleca
+FROM ghcr.io/letsencrypt/pebble AS pebbleca
 FROM jc21/gotools:latest AS gobuild
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index ba90068d..a59c636a 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -1,5 +1,5 @@
 FROM nginxproxymanager/testca AS testca
-FROM letsencrypt/pebble AS pebbleca
+FROM ghcr.io/letsencrypt/pebble AS pebbleca
 FROM nginxproxymanager/nginx-full:acmesh-golang
 LABEL maintainer="Jamie Curnow <jc@jc21.com>"
 
diff --git a/scripts/buildx b/scripts/buildx
index 4ab28473..d687c20b 100755
--- a/scripts/buildx
+++ b/scripts/buildx
@@ -24,7 +24,7 @@ docker buildx build \
 	--build-arg SKIP_TESTS=1 \
 	--build-arg GOPRIVATE="${GOPRIVATE:-}" \
 	--build-arg GOPROXY="${GOPROXY:-}" \
-	--platform linux/amd64,linux/arm64,linux/arm/7 \
+	--platform linux/amd64,linux/arm64 \
 	--progress plain \
 	--pull \
 	-f docker/Dockerfile \