diff --git a/shell-common/.config/shell-common/01_exports.sh b/shell-common/.config/shell-common/01_exports.sh
index 8151138..ad78062 100644
--- a/shell-common/.config/shell-common/01_exports.sh
+++ b/shell-common/.config/shell-common/01_exports.sh
@@ -27,11 +27,11 @@ for editor in "${editor_preferences[@]}"; do
 done
 
 # Go stuff
-export GOPATH=$HOME/go/
+export GOPATH=$XDG_DATA_HOME/go/
 export PATH=${GOPATH}bin:$PATH
 if [ -z ${GOROOT+x} ] && [ -d /usr/local/go ]; then
     export GOROOT=/usr/local/go/
-    export PATH=$PATH:$GOROOT/bin:$HOME/go/bin
+    export PATH=$PATH:$GOROOT/bin
 fi
 
 # Python stuff
diff --git a/shell-common/.config/shell-common/02_xdg_overrides.sh b/shell-common/.config/shell-common/02_xdg_overrides.sh
new file mode 100644
index 0000000..c5b1eab
--- /dev/null
+++ b/shell-common/.config/shell-common/02_xdg_overrides.sh
@@ -0,0 +1,5 @@
+# Override application locations to fix XDG
+export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+export TLDR_CACHE_DIR="$XDG_CACHE_HOME"/tldr
+export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"