diff --git a/containers/base/config/bashrc b/containers/base/config/bashrc
index e1be1d4..0deba25 100644
--- a/containers/base/config/bashrc
+++ b/containers/base/config/bashrc
@@ -10,7 +10,7 @@ export EDITOR=nvim \
   XDG_RUNTIME_DIR=/run/user/1000 \
   SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \
   DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/bus" \
-  PS1="\[\e[30;46m\] $CONTAINER_NAME | \w \[\e[0;36m\]\[\e[m\] " \
+  PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \
   TZ="Europe/Amsterdam"
 
 # === aliases and functions ===
diff --git a/containers/go/config.sh b/containers/go/config.sh
index 32ff678..923eea6 100644
--- a/containers/go/config.sh
+++ b/containers/go/config.sh
@@ -1,3 +1,3 @@
-for dir in "Code" "Downloads" ".config/devcontainer"; do
+for dir in "Code" "Documents" "Downloads" ".config/devcontainer"; do
   arg "-v $HOME/$dir:/home/user/$dir"
 done
diff --git a/enter.sh b/enter.sh
index 4246ada..de5ad08 100755
--- a/enter.sh
+++ b/enter.sh
@@ -13,6 +13,7 @@ arg() { echo -n " $@"; }
 # starting a new container.
 run_args() {
   arg "--name $name"
+  arg "--hostname $name"
 
   # Disable some security settings so host directories can
   # be mounted without problems.
@@ -23,7 +24,6 @@ run_args() {
   # container.
   [ -e "/run/user/$UID/bus" ] && arg "-v /run/user/$UID/bus:/tmp/bus" # Use host dbus.
   arg "-e HOST_HOME=$HOME"                                            # Used to translate container path to host.
-  arg "-e CONTAINER_NAME=$name"
 
   # Use host networking.
   arg "--net=host"