diff --git a/etc/dockerfile b/etc/dockerfile
index c2646d4..d514a18 100644
--- a/etc/dockerfile
+++ b/etc/dockerfile
@@ -1,13 +1,13 @@
-FROM golang:alpine3.18 AS build
+FROM golang:alpine3.21 AS build
 RUN apk add build-base git
 WORKDIR /src
 COPY . .
-RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/go/pkg \
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/go/pkg \
   make host
 
 FROM alpine:latest
-RUN apk add --no-cache ca-certificates && \
-    update-ca-certificates
+RUN apk add --no-cache ca-certificates && update-ca-certificates
 COPY --from=build /src/out/yarr /usr/local/bin/yarr
 EXPOSE 7070
 ENTRYPOINT ["/usr/local/bin/yarr"]
diff --git a/etc/dockerfile.arm b/etc/dockerfile.arm
index d0a4d54..ef8eb08 100644
--- a/etc/dockerfile.arm
+++ b/etc/dockerfile.arm
@@ -12,9 +12,9 @@ RUN env DEBIAN_FRONTEND=noninteractive \
     apt install -y qemu-user qemu-user-static
 
 # Install Golang
-RUN wget --quiet https://go.dev/dl/go1.18.2.linux-amd64.tar.gz && \
+RUN wget --quiet https://go.dev/dl/go1.24.1.linux-amd64.tar.gz && \
     rm -rf /usr/local/go && \
-    tar -C /usr/local -xzf go1.18.2.linux-amd64.tar.gz
+    tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz
 ENV PATH=$PATH:/usr/local/go/bin
 
 # Copy source code