diff --git a/zsh/.zshrc b/zsh/.zshrc
index 994382e..3b8a663 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -225,17 +225,15 @@ function o () {
 	xdg-open "$1" &!
 }
 
-function server() {
-    waypipe ssh -t mallorea env REMOTE_PATH="$(pwd)" "zsh --login"
+function run_waypipe() {
+    waypipe ssh -t $1 env REMOTE_PATH="$(pwd)" "zsh --login"
 }
 
-function riva() {
-    waypipe ssh -t riva env REMOTE_PATH="$(pwd)" "zsh --login"
-}
+alias mallorea="run_waypipe mallorea"
+alias vault="run_waypipe vault"
+alias riva="run_waypipe riva"
+alias kell="run_waypipe kell"
 
-function kell() {
-    waypipe ssh -t kell env REMOTE_PATH="$(pwd)" "zsh --login"
-}
 
 if [ "$SSH_CLIENT" ]
 then