diff --git a/containers/base/Containerfile b/containers/base/Containerfile
index 34b5c07..5717114 100644
--- a/containers/base/Containerfile
+++ b/containers/base/Containerfile
@@ -15,8 +15,10 @@ RUN useradd -ms /bin/bash user && \
 USER user
 WORKDIR /home/user
 RUN mkdir .config .local .cache
+
 RUN git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim
 COPY --chown=user:user config/bashrc .bashrc
 COPY --chown=user:user config/git .config/git/config
 COPY config/bin /usr/local/bin
+
 VOLUME /home/user
diff --git a/containers/base/config/bashrc b/containers/base/config/bashrc
index ad834ec..b91273f 100644
--- a/containers/base/config/bashrc
+++ b/containers/base/config/bashrc
@@ -4,8 +4,6 @@
 export EDITOR=nvim \
   WAYLAND_DISPLAY=wayland-0 \
   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\] \h | \w \[\e[0;36m\]\[\e[m\] " \
   TZ="Europe/Amsterdam"
 
diff --git a/containers/go/config.sh b/containers/go/config.sh
new file mode 100644
index 0000000..71f779f
--- /dev/null
+++ b/containers/go/config.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+arg "-v $HOME/Documents/devc/go:/home/user/projects"
diff --git a/containers/infra/config.sh b/containers/infra/config.sh
new file mode 100644
index 0000000..43842d4
--- /dev/null
+++ b/containers/infra/config.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+arg "-v $HOME/Documents/devc/infra:/home/user/projects"
diff --git a/devc.sh b/devc.sh
index 0b88552..edbc2a1 100755
--- a/devc.sh
+++ b/devc.sh
@@ -49,6 +49,7 @@ param_args() {
     -host-spawn) # Enable spawning host commands from inside the container using host-spawn.
       arg "-v /run/user/$UID/bus:/tmp/bus"
       arg "-e HOST_HOME=$HOME" # Use to translate paths.
+      arg "-e DBUS_SESSION_BUS_ADDRESS='unix:path=/tmp/bus'"
       ;;
     *) # Use unknown arguments a podman arguments.
       arg "$1" ;;
@@ -58,7 +59,6 @@ param_args() {
 }
 
 ### MAIN ###
-
 # Get container registry from DEVC_REGISTRY env variable.
 if [ -n "${DEVC_REGISTRY:-}" ]; then
   registry="$DEVC_REGISTRY"