diff --git a/group_vars/all.yml b/group_vars/all.yml
index 25dfafc..3986ddd 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -4,7 +4,7 @@
 #
 # enable keychain as ssh agent
 dotfiles__additional_user_bashrc_lines:
- - 'eval $(keychain --eval --quiet id_ed25519)'
+ - '[[ $- == *i* ]] && eval $(keychain --eval --quiet id_ed25519)'
  - '_gopass_bash_autocomplete() {'
  - '   local cur opts base'
  - '   COMPREPLY=()'
diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml
index a784039..bbe8f79 100644
--- a/group_vars/thinkpad.yml
+++ b/group_vars/thinkpad.yml
@@ -7,9 +7,6 @@ install_keychain: true
 # i3wm config:
 enable_lock_after_time: true
 
-base__additional_user_bashrc_lines:
-  - eval $(keychain --eval --quiet id_ed25519)
-
 i3_packages_extra:
   - ranger
   - light
@@ -20,7 +17,6 @@ i3_packages_extra:
   - evince
   - speedtest-cli
 
-
 i3_font_size: 11
 i3_focus_follows_mouse: true
 
diff --git a/host_vars/l460.yml b/host_vars/l460.yml
index 0d17ebd..f866924 100644
--- a/host_vars/l460.yml
+++ b/host_vars/l460.yml
@@ -12,9 +12,6 @@ users:
 admins:
   - lilian
 
-base__additional_user_bashrc_lines:
-  - '[[ $- == *i* ]] && eval $(keychain --eval --quiet id_ed25519)'
-
 # used to automatically generate correct admin keys
 admins_ssh_root_prefix:
   - l3d