diff --git a/bashrc b/bashrc
index 41afad6..1466e62 100755
--- a/bashrc
+++ b/bashrc
@@ -152,9 +152,3 @@ done <<< "${@:-$(cat /dev/stdin)}"
 #export RUSTC_WRAPPER=sccache
 export CARGO_TARGET_DIR=/tmp/cargo-target
 
-# this has to be last
-if [[ -z "$ZELLIJ" ]]; then
-    zellij attach -c drop
-    # uncomment for exit shell when zellij exits
-    # exit
-fi
diff --git a/bin/z b/bin/z
new file mode 100755
index 0000000..1a6d3ac
--- /dev/null
+++ b/bin/z
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec zellij attach -c "$USER@$(hostname -s)"
+
diff --git a/i3/config b/i3/config
index db8dfca..c238946 100644
--- a/i3/config
+++ b/i3/config
@@ -41,7 +41,7 @@ exec --no-startup-id feh --bg-scale /home/mopar/Documents/wallpaper/1056662-arch
 
 #exec --no-startup-id yakuake
 #exec --no-startup-id sxhkd
-bindsym F12 exec --no-startup-id tdrop -ma -h '100%' alacritty -o window.opacity=0.8 -e zellij attach -c drop
+bindsym F12 exec --no-startup-id tdrop -ma -h '100%' alacritty -o window.opacity=0.8 -e ~/.config/bin/z
 
 exec --no-startup-id picom -bCG --no-fading-openclose --vsync --backend glx --inactive-opacity=1 --frame-opacity=0.5 --menu-opacity=0.8
 
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 3190091..ade5771 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -1,7 +1,8 @@
 # negative -w arg to account for a border width (default: 100%)
 #F11
-#    tdrop -ma -w -4 -h '70%' -y 4 cool-retro-term -e zellij attach -c drop
+#    tdrop -ma -w -4 -h '100%' -y 4 cool-retro-term -e ~/.config/bin/z
 
 # negative -w arg to account for a border width (default: 100%)
 F12
-    tdrop -ma -h '100%' alacritty -o window.opacity=0.8 -e zellij attach -c drop
+    tdrop -ma -h '100%' alacritty -o window.opacity=0.8 -e ~/.config/bin/z
+