diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2
index 48e8ede199..fc7066361e 100644
--- a/sonic-slave-stretch/Dockerfile.j2
+++ b/sonic-slave-stretch/Dockerfile.j2
@@ -294,7 +294,8 @@ RUN export VERSION=1.11.5 \
  && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \
 {%- endif %}
  && echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \
- && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc
+ && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc \
+ && rm go$VERSION.linux-*.tar.gz
 
 # For p4 build
 RUN pip install \
diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2
index 287382c56b..a5f02a6929 100644
--- a/sonic-slave/Dockerfile.j2
+++ b/sonic-slave/Dockerfile.j2
@@ -286,7 +286,8 @@ RUN export VERSION=1.11.5 \
  && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \
 {%- endif %}
  && echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \
- && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc
+ && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc \
+ && rm go$VERSION.linux-*.tar.gz
 
 # Upgrade pip2
 # Note: use pip2 specific version so jinja2 2.10 will install