diff --git a/Dockerfile b/Dockerfile
index 0008a0d..b20c512 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,20 @@
 # Stage 1
-FROM alpine:latest AS build
+FROM alpine:latest AS base
 
+FROM base AS hugo
 # Install the Hugo go app.
-RUN apk add --update hugo git
+RUN apk add --update curl
+
+ARG TARGETARCH
+ARG HUGO_VERSION=0.161.1
+RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz"
+RUN tar -xf "hugo.tar.gz" hugo -C /usr/bin
+
+FROM base AS build
+
+COPY --from=hugo /usr/bin/hugo /bin/hugo
+
+RUN apk add --update git libc6-compat libstdc++
 
 WORKDIR /opt/HugoApp