diff --git a/container/Containerfile b/container/Containerfile
index 9996716..130c982 100644
--- a/container/Containerfile
+++ b/container/Containerfile
@@ -123,8 +123,9 @@ RUN mkdir -p /usr/local/bin/python-bins/code-review-graph && \
     /usr/local/bin/python-bins/code-review-graph/bin/code-review-graph \
     /usr/local/bin/code-review-graph
 
-# Rustup is intended to remain writable by the development user.
-RUN chown -R user:user /usr/local/rust
+# Rustup, Go dir is intended to remain writable by the development user.
+RUN chown -R user:user /usr/local/rust && \
+    chown -R user:user /home/user/go
 
 USER user
 WORKDIR /home/user
diff --git a/container/config/bashrc b/container/config/bashrc
index 6782f62..9245994 100644
--- a/container/config/bashrc
+++ b/container/config/bashrc
@@ -7,7 +7,6 @@ export EDITOR=hx \
   SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \
   CARGO_HOME=/usr/local/rust \
   RUSTUP_HOME=/usr/local/rust \
-  GOPATH=/usr/local/go \
   PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \
   TZ="Europe/Amsterdam" \
   SHELL="/bin/bash"
diff --git a/container/config/bin/host b/container/config/bin/host
index 0610301..b64a5cb 100755
--- a/container/config/bin/host
+++ b/container/config/bin/host
@@ -3,4 +3,5 @@ export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/bus"
 
 cmd="${0##*/}"
 [[ "$cmd" == "host" ]] && unset cmd
-exec host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" ${cmd:+"$cmd"} "$@
\ No newline at end of file
+exec host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" ${cmd:+"$cmd"} "$@"
+