diff --git a/.woodpecker/feature.yml b/.woodpecker/feature.yml
index 22a3cd2..f837545 100644
--- a/.woodpecker/feature.yml
+++ b/.woodpecker/feature.yml
@@ -2,6 +2,7 @@ steps:
   build-and-push:
     image: woodpeckerci/plugin-docker-buildx
     settings:
+      platforms: linux/amd64,linux/arm64
       repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}"
       tags: "feature-${CI_COMMIT_BRANCH##feature/}"
       username:
diff --git a/.woodpecker/latest.yml b/.woodpecker/latest.yml
index 6ffa29e..34cdc03 100644
--- a/.woodpecker/latest.yml
+++ b/.woodpecker/latest.yml
@@ -2,6 +2,7 @@ steps:
   build-and-push:
     image: woodpeckerci/plugin-docker-buildx
     settings:
+      platforms: linux/amd64,linux/arm64
       repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}"
       tags: latest
       username:
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
index 8be2b19..c130cac 100644
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -2,6 +2,7 @@ steps:
   release:
     image: woodpeckerci/plugin-docker-buildx
     settings:
+      platforms: linux/amd64,linux/arm64
       repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}"
       tags: "${CI_COMMIT_TAG##v}"
       username:
diff --git a/completions b/completions
old mode 100644
new mode 100755
index 16336c7..bc22ada
--- a/completions
+++ b/completions
@@ -3,7 +3,7 @@
 # Useful info found at http://www.linuxjournal.com/content/more-using-bash-complete-command
 
 MU_CLI_VERSION="1.0.3"
-sh -c "docker run --rm --volume /tmp:/tmp semtech/mu-cli:${MU_CLI_VERSION} bash ensure-files.sh &"
+sh -c "docker run --platform linux/amd64 --rm --volume /tmp:/tmp semtech/mu-cli:${MU_CLI_VERSION} bash ensure-files.sh &"
 
 # I use variables that start with retval to indicate that they are only used to
 # populate the return value for the function whose name is the second part of the
diff --git a/mu b/mu
index c29d871..98dbcc5 100755
--- a/mu
+++ b/mu
@@ -31,7 +31,7 @@ function ensure_mu_cli_docker() {
 
     if [[ -z $container_hash ]] ;
     then
-        docker run --volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null
+        docker run --platform linux/amd64 --volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null
         if [[ "$?" -ne "0" ]]
         then
             echo "I could not start the mu-cli container.  Aborting operation." >> /dev/stderr