diff --git a/Dockerfile b/Dockerfile
index 47581aa8..18f0d379 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,8 +28,6 @@ RUN echo "Write tag ${BUILD_TAG} and commit ${BUILD_COMMIT} in binary." && \
 
 # CGO_ENABLED=1 is mandatory for building go-sqlite3
 RUN cd cmd/authelia && GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -tags netgo -ldflags '-w -linkmode external -extldflags -static' -o authelia && cd ../../
-
-# CGO_ENABLED=1 is mandatory for building go-sqlite3
 RUN cd cmd/authelia-scripts && GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -o authelia-scripts -ldflags '-w -linkmode external -extldflags -static'
 
 
@@ -62,4 +60,4 @@ EXPOSE 9091
 VOLUME /etc/authelia
 VOLUME /var/lib/authelia
 
-CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
+CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
\ No newline at end of file
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 46c9b407..7a22729e 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -1,14 +1,16 @@
 # =======================================
 # ===== Build image for the backend =====
 # =======================================
-FROM arm32v7/golang:1.13-alpine AS builder-backend
+FROM golang:1.13-alpine AS builder-backend
 
 ARG BUILD_TAG
 ARG BUILD_COMMIT
+ARG CC_VERSION="v14"
 
-# qemu binary, gcc and musl-dev are required for building go-sqlite3
-COPY ./qemu-arm-static /usr/bin/qemu-arm-static
-RUN apk --no-cache add gcc musl-dev
+# gcc cross-compiler is required for building go-sqlite3
+RUN apk --no-cache add curl && \
+    curl -Lfs -o /tmp/gcc-7.3.0-arm-linux-musleabihf.tar.xz "https://github.com/just-containers/musl-cross-make/releases/download/${CC_VERSION}/gcc-7.3.0-arm-linux-musleabihf.tar.xz" && \
+    tar xf /tmp/gcc-7.3.0-arm-linux-musleabihf.tar.xz -C /
 
 WORKDIR /go/src/app
 
@@ -28,10 +30,8 @@ RUN echo "Write tag ${BUILD_TAG} and commit ${BUILD_COMMIT} in binary." && \
     sed -i "s/__BUILD_TIME__/${BUILD_TIME}/" cmd/authelia/constants.go
 
 # CGO_ENABLED=1 is mandatory for building go-sqlite3
-RUN cd cmd/authelia && GOOS=linux GOARCH=arm CGO_ENABLED=1 go build -tags netgo -ldflags '-w -linkmode external -extldflags -static' -o authelia && cd ../../
-
-# CGO_ENABLED=1 is mandatory for building go-sqlite3
-RUN cd cmd/authelia-scripts && GOOS=linux GOARCH=arm CGO_ENABLED=1 go build -o authelia-scripts -ldflags '-w -linkmode external -extldflags -static'
+RUN cd cmd/authelia && GOOS=linux GOARCH=arm CGO_ENABLED=1 CC=arm-linux-musleabihf-gcc go build -tags netgo -ldflags '-w -linkmode external -extldflags -static' -o authelia && cd ../../
+RUN cd cmd/authelia-scripts && GOOS=linux GOARCH=arm CGO_ENABLED=1 CC=arm-linux-musleabihf-gcc go build -o authelia-scripts -ldflags '-w -linkmode external -extldflags -static'
 
 
 # ========================================
@@ -66,4 +66,4 @@ EXPOSE 9091
 VOLUME /etc/authelia
 VOLUME /var/lib/authelia
 
-CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
+CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
\ No newline at end of file
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 11be6dbe..a1ba6c75 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -1,14 +1,16 @@
 # =======================================
 # ===== Build image for the backend =====
 # =======================================
-FROM arm64v8/golang:1.13-alpine AS builder-backend
+FROM golang:1.13-alpine AS builder-backend
 
 ARG BUILD_TAG
 ARG BUILD_COMMIT
+ARG CC_VERSION="v14"
 
-# qemu binary, gcc and musl-dev are required for building go-sqlite3
-COPY ./qemu-aarch64-static /usr/bin/qemu-aarch64-static
-RUN apk --no-cache add gcc musl-dev
+# gcc cross-compiler is required for building go-sqlite3
+RUN apk --no-cache add curl && \
+    curl -Lfs -o /tmp/gcc-7.3.0-aarch64-linux-musl.tar.xz "https://github.com/just-containers/musl-cross-make/releases/download/${CC_VERSION}/gcc-7.3.0-aarch64-linux-musl.tar.xz" && \
+    tar xf /tmp/gcc-7.3.0-aarch64-linux-musl.tar.xz -C /
 
 WORKDIR /go/src/app
 
@@ -28,10 +30,8 @@ RUN echo "Write tag ${BUILD_TAG} and commit ${BUILD_COMMIT} in binary." && \
     sed -i "s/__BUILD_TIME__/${BUILD_TIME}/" cmd/authelia/constants.go
 
 # CGO_ENABLED=1 is mandatory for building go-sqlite3
-RUN cd cmd/authelia && GOOS=linux GOARCH=arm64 CGO_ENABLED=1 go build -tags netgo -ldflags '-w -linkmode external -extldflags -static' -o authelia && cd ../../
-
-# CGO_ENABLED=1 is mandatory for building go-sqlite3
-RUN cd cmd/authelia-scripts && GOOS=linux GOARCH=arm64 CGO_ENABLED=1 go build -o authelia-scripts -ldflags '-w -linkmode external -extldflags -static'
+RUN cd cmd/authelia && GOOS=linux GOARCH=arm64 CGO_ENABLED=1 CC=aarch64-linux-musl-gcc go build -tags netgo -ldflags '-w -linkmode external -extldflags -static' -o authelia && cd ../../
+RUN cd cmd/authelia-scripts && GOOS=linux GOARCH=arm64 CGO_ENABLED=1 CC=aarch64-linux-musl-gcc go build -o authelia-scripts -ldflags '-w -linkmode external -extldflags -static'
 
 
 # ========================================
@@ -66,4 +66,4 @@ EXPOSE 9091
 VOLUME /etc/authelia
 VOLUME /var/lib/authelia
 
-CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
+CMD ["./authelia", "--config", "/etc/authelia/configuration.yml"]
\ No newline at end of file