diff --git a/containers/go/Containerfile b/containers/go/Containerfile
index 62023b9..f5ccc37 100644
--- a/containers/go/Containerfile
+++ b/containers/go/Containerfile
@@ -3,6 +3,8 @@ FROM job79/base:${TAG}
 USER root
 
 RUN GO_VERSION=$(curl -sL "https://go.dev/VERSION?m=text" | head -n 1 | tr -d '\r\n') && \
-  curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local/bin --strip-components=2 go/bin/go go/bin/gofmt
+  curl -sL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" | tar xz -C /usr/local && \
+  ln -sf /usr/local/go/bin/go /usr/local/bin/go && \
+  ln -sf /usr/local/go/bin/gofmt /usr/local/bin/gofmt
 
 USER user