diff --git a/Dockerfile b/Dockerfile
index b135650..10f3aae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,10 @@ ENV GOLANG_VERSION=1.15.10
 
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends wget
-RUN wget https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-RUN tar -xzf go$GOLANG_VERSION.linux-amd64.tar.gz 
+RUN wget https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz 
+RUN tar -xzf go$GOLANG_VERSION.linux-amd64.tar.gz -C /usr/local/
 RUN rm go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOROOT=/go
-ENV PATH=/go/bin:$PATH
+ENV GOROOT=/usr/local/go
+ENV PATH=/usr/local/go/bin:$PATH
 
 ENTRYPOINT /bin/bash
diff --git a/README.md b/README.md
index c5ddfce..b74835e 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # mingw-go
 
-This container is based on [purplekarrot/mingw-w64-x86-64](https://hub.docker.com/r/purplekarrot/mingw-w64-x86-64) and then has Go 1.15.10 installed in /go
+This container is based on [purplekarrot/mingw-w64-x86-64](https://hub.docker.com/r/purplekarrot/mingw-w64-x86-64) and then has Go 1.15.10 installed in /usr/local/go