diff --git a/Dockerfile b/Dockerfile
index e9885dc..e42fd44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,10 @@
 FROM debian AS builder
 
-RUN apt-get update \
- && apt-get install -y curl jq git \
- && ARCH=$(uname -m | sed -e 's/x86_/amd/' -e 's/aarch/arm/') \
- && echo ">>> ARCH $ARCH" \
- && URL=$(curl -sS -H 'Accept: appliction/vnd.github.v3+json' https://api.github.com/repos/gohugoio/hugo/releases/latest | jq -r '.assets[] | select(.name | test("hugo_[^e].*linux-'$ARCH'.tar.gz")) | .browser_download_url') \
- && echo ">>> URL $URL" \
- && curl -sSL -o hugo.tar.gz $URL \
- && tar -C /usr/local/bin -xf hugo.tar.gz hugo
+RUN apt-get update && apt-get install -y curl git
 
 COPY . /site
-
 WORKDIR /site
-
-RUN hugo
+RUN ./build.sh
 
 FROM nginx
 
diff --git a/build.sh b/build.sh
index f312935..178eee8 100755
--- a/build.sh
+++ b/build.sh
@@ -3,16 +3,10 @@
 set -euo pipefail
 
 HUGO_VERSION=0.148.2
-GO_VERSION=1.24.5
 
 export TZ=Europe/Oslo
 
-# Install Go
-echo "Installing Go ${GO_VERSION}..."
-curl -sLJO "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz"
-tar -C "${HOME}/.local" -xf "go${GO_VERSION}.linux-amd64.tar.gz"
-rm "go${GO_VERSION}.linux-amd64.tar.gz"
-export PATH="${HOME}/.local/go/bin:${PATH}"
+mkdir -p "${HOME}/.local"
 
 # Install Hugo
 echo "Installing Hugo ${HUGO_VERSION}..."
@@ -24,7 +18,6 @@ export PATH="${HOME}/.local/hugo:${PATH}"
 
 # Verify installations
 echo "Verifying installations..."
-echo Go: "$(go version)"
 echo Hugo: "$(hugo version)"
 
 # Configure Git