diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 77de9b79c..9f9d3ce6b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,3 +34,4 @@ jobs:
           push: false
           files: docker/daemon-bake.hcl
           targets: smartnode
+          set: smartnode.platform=linux/amd64
diff --git a/Makefile b/Makefile
index 29a029bd9..dcecb47fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
 VERSION=v$(shell cat shared/version.txt)
-LOCAL_OS=$(shell go env GOOS)-$(shell go env GOARCH)
+LOCAL_OS=$(shell go env GOOS)
+LOCAL_ARCH=$(shell go env GOARCH)
+# Needed for binary artifacts of format `rocketpool-cli-linux-amd64`
+LOCAL_TARGET=${LOCAL_OS}-${LOCAL_ARCH}
+# Needed for docker --platform arguments of format `linux/amd64`
+LOCAL_PLATFORM=${LOCAL_OS}/${LOCAL_ARCH}
 
 BUILD_DIR=build
 BIN_DIR=${BUILD_DIR}/${VERSION}/bin
@@ -35,17 +40,17 @@ all: ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon ${BUILD_DIR}/tre
 release: ${CLI_TARGET_STRINGS} ${DAEMON_TARGET_STRINGS} ${TREEGEN_TARGET_STRINGS} ${BUILD_DIR}/rocketpool-cli ${BUILD_DIR}/rocketpool-daemon ${BUILD_DIR}/treegen
 
 # Target for build/rocketpool-cli which is a symlink to an os-specific build
-${BUILD_DIR}/rocketpool-cli: ${BIN_DIR}/rocketpool-cli-${LOCAL_OS}
-	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-cli-${LOCAL_OS} ${BUILD_DIR}/rocketpool-cli
+${BUILD_DIR}/rocketpool-cli: ${BIN_DIR}/rocketpool-cli-${LOCAL_TARGET}
+	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-cli-${LOCAL_TARGET} ${BUILD_DIR}/rocketpool-cli
 
 
 # Target for build/rocketpool-daemon which is a symlink to an os-specific build
-${BUILD_DIR}/rocketpool-daemon: ${BIN_DIR}/rocketpool-daemon-${LOCAL_OS}
-	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-daemon-${LOCAL_OS} ${BUILD_DIR}/rocketpool-daemon
+${BUILD_DIR}/rocketpool-daemon: ${BIN_DIR}/rocketpool-daemon-${LOCAL_TARGET}
+	ln -sf $(shell pwd)/${BIN_DIR}/rocketpool-daemon-${LOCAL_TARGET} ${BUILD_DIR}/rocketpool-daemon
 
 # Target for build/treegen which is a symlink to a version-specific build
-${BUILD_DIR}/treegen: ${BIN_DIR}/treegen-${LOCAL_OS}
-	ln -sf $(shell pwd)/${BIN_DIR}/treegen-${LOCAL_OS} ${BUILD_DIR}/treegen
+${BUILD_DIR}/treegen: ${BIN_DIR}/treegen-${LOCAL_TARGET}
+	ln -sf $(shell pwd)/${BIN_DIR}/treegen-${LOCAL_TARGET} ${BUILD_DIR}/treegen
 
 # docker-builder container
 .PHONY: docker-builder
@@ -111,32 +116,27 @@ endif
 
 # Multiarch builder
 ${BUILD_DIR}/docker-buildx-builder: ${BUILD_DIR}
-	docker buildx create --name smartnode-builder --driver docker-container --platform linux/amd64,linux/arm64
+	docker buildx create --name smartnode-builder --driver docker-container --platform linux/amd64,linux/arm64 || true
 	touch ${BUILD_DIR}/docker-buildx-builder
 
 # Docker containers
 .PHONY: docker
 docker: ${BUILD_DIR}/docker-buildx-builder
-	VERSION=${VERSION} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode
+	# override the platform so we can load the resulting image into docker
+	VERSION=${VERSION} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.platform=${LOCAL_PLATFORM}"
 
 .PHONY: docker-push
-docker-push: docker
-	echo
-	echo -n "Publishing smartnode:${VERSION} containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
-	rm -rf ~/.docker/manifests/docker.io_rocketpool_smartnode-${VERSION}
-	docker push rocketpool/smartnode:${VERSION}-amd64
-	docker push rocketpool/smartnode:${VERSION}-arm64
-	docker manifest create rocketpool/smartnode:${VERSION} --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
-	docker manifest push --purge rocketpool/smartnode:${VERSION}
+docker-push: ${BUILD_DIR}/docker-buildx-builder
+	echo -n "Building ${VERSION} and publishing containers. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
+	# override the output type to push to dockerhub
+	VERSION=${VERSION} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry"
 	echo "Done!"
 
 .PHONY: docker-latest
-docker-latest: docker-push
-	echo
-	echo -n "Publishing smartnode:${VERSION} as latest. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
-	rm -rf ~/.docker/manifests/docker.io_rocketpool_smartnode-latest
-	docker manifest create rocketpool/smartnode:latest --amend rocketpool/smartnode:${VERSION}-amd64 --amend rocketpool/smartnode:${VERSION}-arm64
-	docker manifest push --purge rocketpool/smartnode:latest
+docker-latest: ${BUILD_DIR}/docker-buildx-builder
+	echo -n "Building ${VERSION}, tagging as latest, and publishing. Continue? [yN]: " && read ans && if [ $${ans:-'N'} != 'y' ]; then exit 1; fi
+	# override the output type to push to dockerhub, and the tags array to tag latest
+	VERSION=${VERSION} docker bake --builder smartnode-builder -f docker/daemon-bake.hcl smartnode --set "smartnode.output=type=registry" --set "smartnode.tags=rocketpool/smartnode:latest"
 
 .PHONY: docker-prune
 docker-prune:
diff --git a/docker/daemon-bake.hcl b/docker/daemon-bake.hcl
index 7dcb5096b..0ba024c2d 100644
--- a/docker/daemon-bake.hcl
+++ b/docker/daemon-bake.hcl
@@ -10,7 +10,6 @@ target "builder" {
   dockerfile = "docker/rocketpool-dockerfile"
   tags = [ 
     "rocketpool/smartnode-builder:${VERSION}",
-    "rocketpool/smartnode-builder:local"
   ]
   target = "smartnode_dependencies"
   platforms = [ "linux/amd64" ]
@@ -18,20 +17,15 @@ target "builder" {
 }
 
 target "smartnode" {
-  name = "smartnode-${arch}"
   dockerfile = "docker/rocketpool-dockerfile"
   args = {
     BUILDPLATFORM = "linux/amd64"
     VERSION = "${VERSION}"
   }
   tags = [
-    "rocketpool/smartnode:${VERSION}-${arch}",
-    "localhost/rocketpool/smartnode:${VERSION}-${arch}"
+    "rocketpool/smartnode:${VERSION}",
   ]
-  matrix = {
-    arch = [ "amd64", "arm64" ]
-  }
   target = "smartnode"
-  platforms = ["linux/${arch}"]
+  platforms = ["linux/amd64", "linux/arm64"]
   output = [{ "type": "docker" }]
 }