diff --git a/files/global-environment b/files/global-environment
index 976defc..9296246 100644
--- a/files/global-environment
+++ b/files/global-environment
@@ -3,7 +3,7 @@ QT_QPA_PLATFORMTHEME=gtk2
 GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 LANG=en_GB.UTF-8
 ARCHFLAGS="-arch x86_64"
-SSH_AUTH_SOCK=/tmp/ssh-agent-jake.sock
+SSH_AUTH_SOCK=/tmp/ssh-agent-{{ user }}.sock
 TERMINATOR=/usr/bin/tilix
 NNN_DE_FILE_MANAGER=nautilus
 GTK_IM_MODULE=ibus
diff --git a/tasks/shell.yml b/tasks/shell.yml
index 3179bec..b7a466e 100644
--- a/tasks/shell.yml
+++ b/tasks/shell.yml
@@ -15,7 +15,7 @@
     group: users
     directory_mode: true
 
-- copy:
+- template:
     src: ./files/global-environment
     dest: /etc/environment
     mode: 0644