diff --git a/docker/Dockerfile-netclient-multiarch b/docker/Dockerfile-netclient-multiarch
index 7144c2a3..aeb9a9e5 100644
--- a/docker/Dockerfile-netclient-multiarch
+++ b/docker/Dockerfile-netclient-multiarch
@@ -1,4 +1,4 @@
-FROM gravitl/builder:latest as builder
+FROM golang:latest as builder
 # add glib support daemon manager
 WORKDIR /app
 ARG version
@@ -9,32 +9,14 @@ ENV GO111MODULE=auto
 
 RUN GOOS=linux CGO_ENABLED=0 /usr/local/go/bin/go build -ldflags="-w -s -X 'main.version=${TAG}'" -o netclient-app netclient/main.go
 
-WORKDIR /root/
-
-RUN apk add --update git build-base libmnl-dev iptables
-
-RUN git clone https://git.zx2c4.com/wireguard-go && \
-    cd wireguard-go && \
-    make && \
-    make install
-
-ENV WITH_WGQUICK=yes
-RUN git clone https://git.zx2c4.com/wireguard-tools && \
-    cd wireguard-tools && \
-    cd src && \
-    make && \
-    make install
-
 FROM alpine:3.13.6
 
 WORKDIR /root/
 
-RUN apk add --no-cache --update bash libmnl gcompat iptables openresolv iproute2
-COPY --from=builder /usr/bin/wireguard-go /usr/bin/wg* /usr/bin/
+RUN apk add --no-cache --update bash libmnl gcompat iptables openresolv iproute2 wireguard-tools 
 COPY --from=builder /app/netclient-app ./netclient
 COPY --from=builder /app/scripts/netclient.sh .
 RUN chmod 0755 netclient && chmod 0755 netclient.sh
 
-ENV WG_QUICK_USERSPACE_IMPLEMENTATION=wireguard-go
 
 ENTRYPOINT ["/bin/sh", "./netclient.sh"]