diff --git a/Dockerfile b/Dockerfile
index c7c3acc..f40a032 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,13 @@ ENV PATH ${PATH}:/go/bin
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0
 ENV GOBIN=/bin
+ARG BUILDARCH=amd64
 RUN rm -r /etc/vpp
 RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
-ADD https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz .
-ADD https://github.com/coredns/coredns/releases/download/v1.9.1/coredns_1.9.1_linux_amd64.tgz .
-RUN tar xzvf spire-1.2.2-linux-x86_64-glibc.tar.gz -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent
-RUN tar xzvf coredns_1.9.1_linux_amd64.tgz -C /bin coredns
+ADD https://github.com/spiffe/spire/releases/download/v1.8.0/spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz .
+ADD https://github.com/coredns/coredns/releases/download/v1.9.1/coredns_1.9.1_linux_${BUILDARCH}.tgz .
+RUN tar xzvf spire-1.8.0-linux-${BUILDARCH}-musl.tar.gz -C /bin --strip=2 spire-1.8.0/bin/spire-server spire-1.8.0/bin/spire-agent
+RUN tar xzvf coredns_1.9.1_linux_${BUILDARCH}.tgz -C /bin coredns
 
 FROM go as build
 WORKDIR /build