diff --git a/home/.ssh/config b/home/.ssh/config
index b912590c..5ffe1d8c 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -10,7 +10,18 @@ host *
 host moria
   HostName home.korhonen.cc
   port 221
-  User balrog
+  User functionalhacker
+  {%@@ if distro_id != "termux" @@%}
+  # Forward GPG agent
+  StreamLocalBindUnlink yes
+  RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.extra
+  RemoteForward /run/user/1000/gnupg/S.gpg-agent.ssh /run/user/{{@@ env['UID'] @@}}/gnupg/S.gpg-agent.ssh
+  {%@@ endif @@%}
+
+host evendim
+  HostName evendim.korhonen.cc
+  port 22
+  User functionalhacker
   {%@@ if distro_id != "termux" @@%}
   # Forward GPG agent
   StreamLocalBindUnlink yes