diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5d1ce1a57..225499401 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install cross-compilers
-        run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu
+        run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Setup Node
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index c3da2193c..13e0f8d56 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install cross-compilers
-        run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu
+        run: sudo apt-get update && sudo apt-get -y install gcc-x86-64-linux-gnu gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc-s390x-linux-gnu
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Setup Node
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index fe2a149ad..3506aef67 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -24,13 +24,14 @@ builds:
       - >-
         {{- if eq .Arch "amd64"}}CC=x86_64-linux-gnu-gcc{{- end }}
         {{- if eq .Arch "arm64"}}CC=aarch64-linux-gnu-gcc{{- end }}
-        {{- if eq .Arch "arm"}}CC=arm-linux-gnueabihf-gcc{{- end }}
+        {{- if eq .Arch "arm"}}CC=arm-linux-gnueabi-gcc{{- end }}
         {{- if eq .Arch "loong64"}}CC=loongarch64-linux-gnu-gcc{{- end }}
         {{- if eq .Arch "ppc64le"}}CC=powerpc64le-linux-gnu-gcc{{- end }}
         {{- if eq .Arch "s390x"}}CC=s390x-linux-gnu-gcc{{- end }}
     goos:
       - linux
     goarm:
+      - 6
       - 7
     goarch:
       - amd64
@@ -41,7 +42,7 @@ builds:
 
 archives:
   - format: tar.gz
-    name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}"
+    name_template: "{{ .ProjectName }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{- if .Arm }}v{{ .Arm }}{{ end }}"
     wrap_in_directory: true
     files:
       - 1pctl