diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 6f3ec839..3f8c4fb1 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -319,7 +319,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y automake autogen build-essential ca-certificates libsqlite3-dev \
-          libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi \
+          libc6-armel-cross libc6-dev-armel-cross gcc-aarch64-linux-gnu binutils-arm-linux-gnueabi \
           libncurses5-dev build-essential bison flex libssl-dev bc gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
           gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libsqlite3-dev gcc-mingw-w64 gcc-mingw-w64-x86-64
 
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 490779eb..1a6917ee 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -314,7 +314,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y automake autogen build-essential ca-certificates libsqlite3-dev \
-          libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi \
+          libc6-armel-cross libc6-dev-armel-cross gcc-aarch64-linux-gnu binutils-arm-linux-gnueabi \
           libncurses5-dev build-essential bison flex libssl-dev bc gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
           gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libsqlite3-dev gcc-mingw-w64 gcc-mingw-w64-x86-64
 
diff --git a/Makefile b/Makefile
index 024fca5d..6eaee095 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,7 @@ build-linux-arm:
 		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm6/statping --tags "netgo linux" ./cmd
 	CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ GO111MODULE="on" GOOS=linux GOARCH=arm GOARM=7 \
 		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm7/statping --tags "netgo linux" ./cmd
-	CGO_ENABLED=1 CC=gcc CXX=g++ GO111MODULE="on" GOOS=linux GOARCH=arm64 \
+	CGO_ENABLED=1 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ GO111MODULE="on" GOOS=linux GOARCH=arm64 \
 		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-arm64/statping --tags "netgo linux" ./cmd
 
 build-folders: