diff --git a/deb-x64/Dockerfile b/deb-x64/Dockerfile
index 91f0250cd..027531d4b 100644
--- a/deb-x64/Dockerfile
+++ b/deb-x64/Dockerfile
@@ -157,6 +157,9 @@ RUN curl -Sl -O https://dd-agent-omnibus.s3.amazonaws.com/kernel-4.9-headers-deb
 COPY ./setup_go.sh /setup_go.sh
 RUN ./setup_go.sh
 
+ENV PATH="/goroot/bin:$PATH"
+ENV PATH="/go/bin:$PATH"
+
 # Download and install golangci-lint
 RUN curl -sSfL -o golangci-lint-install.sh https://raw.githubusercontent.com/golangci/golangci-lint/v1.44.2/install.sh \
     && echo "1c2edb726aad6bf7d260d95c370bd9ec0fb1a8651e6db6f77f250dd66067de0c  golangci-lint-install.sh" | sha256sum --check \
diff --git a/setup_go.sh b/setup_go.sh
index 740ccdfc8..4c7a526e4 100755
--- a/setup_go.sh
+++ b/setup_go.sh
@@ -42,9 +42,6 @@ ln -sf /usr/local/binutils/bin/ld /usr/bin/ld
 
 ./all.bash
 
-# Update PATH to include the built go binaries
-echo 'export PATH="/goroot/bin:$PATH"' >> /root/.bashrc
-
 # Remove gimme
 rm -rf $HOME/.gimme
 rm /bin/gimme