diff --git a/ssh/epilogue b/ssh/epilogue
index 8001630..d630445 100644
--- a/ssh/epilogue
+++ b/ssh/epilogue
@@ -1,8 +1,8 @@
-Host gitea.* github.com gitlab.com *.github.com *.gitlab.com
+Host gitea gitea.* github.com gitlab.com *.github.com *.gitlab.com
 	User git
 
 
 Host *
-	IdentityFile ~/.ssh/id_%L-%h
+	IdentityFile ~/.ssh/id_%L${CSHENV_MACHINE_SUFFIX}-%h
 
 # vim: ft=sshconfig
diff --git a/tcshrc b/tcshrc
index 9be9074..457b67e 100644
--- a/tcshrc
+++ b/tcshrc
@@ -9,6 +9,8 @@ endif
 
 set path=( ${CSHENV_DIR}/bin ${path} )
 
+setenv CSHENV_MACHINE_SUFFIX
+
 
 # Figure out what kind of tcsh we are running.
 if( $?tcsh ) then