diff --git a/build_and_push.sh b/build_and_push.sh
index 4a910af..ca9614b 100755
--- a/build_and_push.sh
+++ b/build_and_push.sh
@@ -2,7 +2,7 @@
 
 REGISTRY_DOMAIN="${REGISTRY_DOMAIN:-git.joeac.net}"
 REGISTRY_USER="${REGISTRY_USER:-joeac}"
-ARCHITECTURE="$(lscpu | grep ^Architecture: | cut -wf2)"
+ARCHITECTURE="$(lscpu | grep ^Architecture: | sed "s/Architecture:[[:space:]]*//")"
 CONTAINER_NAME_PREFIX="${CONTAINER_NAME_PREFIX:-$([ "armv7" -eq $(echo "$ARCHITECTURE" | cut -c1-5) ] && "armv7/" || "")}"
 ALPINE_VERSION="${ALPINE_VERSION:-$(head -n 1 alpine-version)}"
 CONTAINER_PATTERN="${CONTAINER_PATTERN:-${1:-*}}"