diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36e51e41..96a89486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. The format
 - **Internal:**
   - Add password confirmation to several `setup` CLI subcommands ([#4072](https://github.com/docker-mailserver/docker-mailserver/pull/4072))
   - Added a `debug getmail` subcommand to `setup` ([#4346](https://github.com/docker-mailserver/docker-mailserver/pull/4346))
+  - Added Smallstep `step` CLI command ([#4376](https://github.com/docker-mailserver/docker-mailserver/pull/4376))
 
 ### Updates
 
diff --git a/target/scripts/build/packages.sh b/target/scripts/build/packages.sh
index 6be95d79..cfd510de 100644
--- a/target/scripts/build/packages.sh
+++ b/target/scripts/build/packages.sh
@@ -38,13 +38,18 @@ function _pre_installation_steps() {
 
 # Install third-party commands to /usr/local/bin
 function _install_utils() {
-  local ARCH_A=$(uname -m)
+  local ARCH_A
+  ARCH_A=$(uname --machine)
   # Alternate naming convention support: x86_64 (amd64) / aarch64 (arm64)
   # https://en.wikipedia.org/wiki/X86-64#Industry_naming_conventions
   local ARCH_B
   case "${ARCH_A}" in
-    ( 'x86_64' )  ARCH_B='amd64' ;;
+    ( 'x86_64'  ) ARCH_B='amd64' ;;
     ( 'aarch64' ) ARCH_B='arm64' ;;
+    ( * )
+      _log 'error' "Unsupported arch: '${ARCH_A}'"
+      return 1
+      ;;
   esac
 
   # TIP: `*.tar.gz` releases tend to forget to reset UID/GID ownership when archiving.