diff --git a/.cross_compile.sh b/.cross_compile.sh
index a374087..66c6df0 100644
--- a/.cross_compile.sh
+++ b/.cross_compile.sh
@@ -5,7 +5,7 @@ set -e
 DIST_PREFIX="nexttrace"
 DEBUG_MODE=${2}
 TARGET_DIR="dist"
-PLATFORMS="darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 linux/mips linux/arm/v7 openbsd/amd64 freebsd/amd64"
+PLATFORMS="darwin/amd64 darwin/arm64 linux/386 linux/amd64 linux/arm64 linux/mips openbsd/amd64 openbsd/arm64 freebsd/amd64 freebsd/arm64"
 
 BUILD_VERSION="$(git describe --tags --always)"
 BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
@@ -17,9 +17,7 @@ mkdir ${TARGET_DIR}
 for pl in ${PLATFORMS}; do
     export GOOS=$(echo ${pl} | cut -d'/' -f1)
     export GOARCH=$(echo ${pl} | cut -d'/' -f2)
-    export GOARM=$(echo ${pl} | cut -d'v' -f2)
     export TARGET=${TARGET_DIR}/${DIST_PREFIX}_${GOOS}_${GOARCH}
-    [[ `echo ${pl} | cut -d'v' -f2` == '' ]] && export GOARM="" || export TARGET=${TARGET_DIR}/${DIST_PREFIX}_${GOOS}_${GOARCH}_v${GOARM}
     if [ "${GOOS}" == "windows" ]; then
         export TARGET=${TARGET_DIR}/${DIST_PREFIX}_${GOOS}_${GOARCH}.exe
     fi
@@ -40,3 +38,23 @@ for pl in ${PLATFORMS}; do
     fi
 done
 
+    export GOOS='linux'
+    export GOARCH='arm'
+    export GOARM='7'
+    export TARGET=${TARGET_DIR}/${DIST_PREFIX}_${GOOS}_${GOARCH}v7
+    echo "build => ${TARGET}"
+    if [ "${DEBUG_MODE}" == "debug" ]; then
+        go build -trimpath -gcflags "all=-N -l" -o ${TARGET} \
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+                        -w -s"
+    else
+        go build -trimpath -o ${TARGET} \
+            -ldflags    "-X 'github.com/xgadget-lab/nexttrace/printer.version=${BUILD_VERSION}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.buildDate=${BUILD_DATE}' \
+                        -X 'github.com/xgadget-lab/nexttrace/printer.commitID=${COMMIT_SHA1}'\
+                        -w -s"
+    fi
+
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 217b247..4dd158e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,11 +36,14 @@ jobs:
           files: |
             dist/nexttrace_darwin_amd64
             dist/nexttrace_darwin_arm64
+            dist/nexttrace_linux_386
             dist/nexttrace_linux_amd64
             dist/nexttrace_linux_arm64
-            dist/nexttrace_linux_arm_v7
+            dist/nexttrace_linux_armv7
             dist/nexttrace_linux_mips
             dist/nexttrace_openbsd_amd64
+            dist/nexttrace_openbsd_arm64
             dist/nexttrace_freebsd_amd64
+            dist/nexttrace_freebsd_arm64
         env:
           GITHUB_TOKEN: ${{ secrets.GT_Token }}