diff --git a/devel/localhost-to-dockerhub b/devel/localhost-to-dockerhub
index 52f374a0..ffa453c8 100755
--- a/devel/localhost-to-dockerhub
+++ b/devel/localhost-to-dockerhub
@@ -27,8 +27,9 @@ if [[ "$tag" = "" ]]; then
     exit 1
 fi
 
-BUILDER_IMAGE=nextstrain/base-builder
-FINAL_IMAGE=nextstrain/base
+NATIVE_BUILDER_IMAGE="nextstrain/base-native-builder"
+EMULATED_BUILDER_IMAGE="nextstrain/base-emulated-builder"
+FINAL_IMAGE="nextstrain/base"
 
 
 # Use Skopeo via a Docker container to copy a tagged image.
@@ -50,18 +51,24 @@ copy-image() {
 
 # copy local $tag to remote $tag
 copy-image \
-    "docker://$registry/$FINAL_IMAGE:$tag" \
-    "docker://docker.io/$FINAL_IMAGE:$tag"
+    docker://$registry/$NATIVE_BUILDER_IMAGE:$tag \
+    docker://docker.io/$NATIVE_BUILDER_IMAGE:$tag
 copy-image \
-    "docker://$registry/$BUILDER_IMAGE:$tag" \
-    "docker://docker.io/$BUILDER_IMAGE:$tag"
+    docker://$registry/$EMULATED_BUILDER_IMAGE:$tag \
+    docker://docker.io/$EMULATED_BUILDER_IMAGE:$tag
+copy-image \
+    docker://$registry/$FINAL_IMAGE:$tag \
+    docker://docker.io/$FINAL_IMAGE:$tag
 
 if [[ "$push_latest" = true ]]; then
     # copy local $tag to remote latest
     copy-image \
-        "docker://$registry/$FINAL_IMAGE:$tag" \
-        "docker://docker.io/$FINAL_IMAGE:latest"
+        docker://$registry/$NATIVE_BUILDER_IMAGE:$tag \
+        docker://docker.io/$NATIVE_BUILDER_IMAGE:latest
+    copy-image \
+        docker://$registry/$EMULATED_BUILDER_IMAGE:$tag \
+        docker://docker.io/$EMULATED_BUILDER_IMAGE:latest
     copy-image \
-        "docker://$registry/$BUILDER_IMAGE:$tag" \
-        "docker://docker.io/$BUILDER_IMAGE:latest"
+        docker://$registry/$FINAL_IMAGE:$tag \
+        docker://docker.io/$FINAL_IMAGE:latest
 fi
diff --git a/devel/pull-from-localhost b/devel/pull-from-localhost
index 81a1e0c5..63707983 100644
--- a/devel/pull-from-localhost
+++ b/devel/pull-from-localhost
@@ -21,9 +21,16 @@ while getopts "p:r:t:" opt; do
     esac
 done
 
+NATIVE_BUILDER_IMAGE="nextstrain/base-native-builder"
+EMULATED_BUILDER_IMAGE="nextstrain/base-emulated-builder"
+FINAL_IMAGE="nextstrain/base"
+
+docker pull \
+    --platform "$platform" \
+    "$registry/$NATIVE_BUILDER_IMAGE:$tag"
 docker pull \
     --platform "$platform" \
-    "$registry/nextstrain/base-builder:$tag"
+    "$registry/$EMULATED_BUILDER_IMAGE:$tag"
 docker pull \
     --platform "$platform" \
-    "$registry/nextstrain/base:$tag"
+    "$registry/$FINAL_IMAGE:$tag"