diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py
index 05b6ed8de..2e39a51e2 100644
--- a/kittens/ssh/main.py
+++ b/kittens/ssh/main.py
@@ -65,7 +65,7 @@ def serialize_env(env: Dict[str, str], base_env: Dict[str, str]) -> bytes:
 def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str]) -> bytes:
 
     def normalize_tarinfo(tarinfo: tarfile.TarInfo) -> tarfile.TarInfo:
-        tarinfo.uname = tarinfo.gname = 'kitty'
+        tarinfo.uname = tarinfo.gname = ''
         tarinfo.uid = tarinfo.gid = 0
         return tarinfo
 
diff --git a/shell-integration/ssh/bootstrap.sh b/shell-integration/ssh/bootstrap.sh
index 9dfece145..af54e20e5 100644
--- a/shell-integration/ssh/bootstrap.sh
+++ b/shell-integration/ssh/bootstrap.sh
@@ -126,7 +126,7 @@ untar_and_read_env() {
 
     tdir=$(command mktemp -d "$HOME/.kitty-ssh-kitten-untar-XXXXXXXXXXXX")
     [ $? = 0 ] || die "Creating temp directory failed"
-    read_n_bytes_from_tty "$1" | command base64 -d | command tar xpjf - --no-same-owner -C "$tdir"
+    read_n_bytes_from_tty "$1" | command base64 -d | command tar xpjf - -C "$tdir"
     data_file="$tdir/data.sh"
     [ -f "$data_file" ] && . "$data_file"
     data_dir="$HOME/$KITTY_SSH_KITTEN_DATA_DIR"