diff --git a/dot_ssh/config b/dot_ssh/config
new file mode 100644
index 0000000..091b3d4
--- /dev/null
+++ b/dot_ssh/config
@@ -0,0 +1,85 @@
+TCPKeepAlive no
+ServerAliveInterval 60
+ServerAliveCountMax 10
+ControlPersist 4h
+ControlMaster auto
+ControlPath ~/.ssh/sockets/socket-%r@%h:%p
+VerifyHostKeyDNS yes
+AddKeysToAgent yes
+
+Host cshpc
+Hostname cshpc.rrze.uni-erlangen.de
+ForwardAgent no
+User unrz254
+
+Host emmy
+HostName emmy
+ForwardAgent no
+User unrz254
+ProxyJump cshpc
+
+Host meggie
+HostName meggie
+ForwardAgent no
+User unrz254
+ProxyJump cshpc
+
+Host testfront
+HostName testfront
+ForwardAgent no
+User unrz254
+ProxyJump cshpc
+
+Host monitoring
+Hostname hpc-monitoring.rrze.uni-erlangen.de
+ForwardAgent no
+User unrz254
+ProxyJump cshpc
+
+Host romonitoring
+Hostname hpc-monitoring.rrze.uni-erlangen.de
+ForwardAgent no
+User rotreibi
+ProxyJump cshpc
+
+Host gondor
+Hostname 192.168.178.60
+ForwardAgent no
+
+Host gitolite
+Hostname moebiusband.org
+ForwardAgent no
+User gitolite3
+
+Host github
+Hostname github.com
+ForwardAgent no
+User git
+
+Host prope-git
+Hostname git.rwth-aachen.de
+ForwardAgent no
+User git
+
+Host metacca-git
+Hostname public.cdl.uni-saarland.de
+ForwardAgent no
+User git
+
+Host rrze-git
+Hostname gitlab.rrze.uni-erlangen.de
+ForwardAgent no
+User git
+
+Host jekyll-rsync
+Hostname moebiusband.org
+IdentityFile ~/.ssh/rsync-key
+
+Host pi-hole
+Hostname 192.168.178.2
+User pi
+
+Host icelake
+ProxyCommand ssh -p 17490 -l unrz254 62.189.71.8 -W %h:%p
+HostName 10.40.0.55
+User unrz254
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 8a873b7..1779e3a 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -48,6 +48,8 @@ export PMIX_MCA_gds='hash'
 
 alias top='htop'
 alias ctags='uctags'
+alias make='gmake'
+alias tar='gtar'
 alias man='manpager.sh'
 alias mutt='neomutt'
 alias dvim='doas nvim'