diff --git a/docs/site/getting-started/installer.md b/docs/site/getting-started/installer.md
index c7a6c5e7..f24df796 100644
--- a/docs/site/getting-started/installer.md
+++ b/docs/site/getting-started/installer.md
@@ -54,9 +54,9 @@ sudo umount /dev/sdb1
       flash-installer
     ```
 
-   The `--ssh-pubkey`, `--language` and `--keymap` are optional.
-   Replace `$HOME/.ssh/id_ed25519.pub` with a path to your SSH public key.
-   If you do not have an ssh key yet, you can generate one with `ssh-keygen -t ed25519` command.
+    The `--ssh-pubkey`, `--language` and `--keymap` are optional.
+    Replace `$HOME/.ssh/id_ed25519.pub` with a path to your SSH public key.
+    If you do not have an ssh key yet, you can generate one with `ssh-keygen -t ed25519` command.
 
     !!! Danger "Specifying the wrong device can lead to unrecoverable data loss."
 
diff --git a/pkgs/tea-create-pr/default.nix b/pkgs/tea-create-pr/default.nix
index 723bf6eb..a22b9a28 100644
--- a/pkgs/tea-create-pr/default.nix
+++ b/pkgs/tea-create-pr/default.nix
@@ -4,7 +4,6 @@
   coreutils,
   git,
   tea,
-  gawk,
   openssh,
 }:
 writeShellApplication {
@@ -15,7 +14,6 @@ writeShellApplication {
     git
     tea
     openssh
-    gawk
   ];
   text = builtins.readFile ./script.sh;
 }
diff --git a/pkgs/tea-create-pr/script.sh b/pkgs/tea-create-pr/script.sh
index ac02d31a..a18351d8 100755
--- a/pkgs/tea-create-pr/script.sh
+++ b/pkgs/tea-create-pr/script.sh
@@ -4,13 +4,15 @@ set -euo pipefail
 remoteFork="${1:-origin}"
 remoteUpstream="${2:-upstream}"
 targetBranch="${3:-main}"
-shift && shift
+shift && shift && shift
 TMPDIR="$(mktemp -d)"
 currentBranch="$(git rev-parse --abbrev-ref HEAD)"
-user="$(git config --get remote.origin.url | awk -F'[@:/]' '{print $3}' | tr -d '\n')"
+user_unparsed="$(tea whoami)"
+user="$(echo "$user_unparsed" | tr -d '\n' | cut -f4 -d' ')"
 tempRemoteBranch="$user-$currentBranch"
 root_dir=$(git rev-parse --show-toplevel)
 
+
 # Function to check if a remote exists
 check_remote() {
   if git remote get-url "$1" > /dev/null 2>&1; then
@@ -29,6 +31,7 @@ if ! check_remote "$remoteUpstream"; then
 fi
 
 upstream_url=$(git remote get-url "$remoteUpstream")
+git fetch "$remoteUpstream"
 repo=$(echo "$upstream_url" | sed -E 's#.*:([^/]+/[^.]+)\.git#\1#')
 
 treefmt -C "$root_dir"
@@ -48,6 +51,7 @@ fi
 
 git push --force -u "$remoteFork" HEAD:refs/heads/"$tempRemoteBranch"
 
+set -x
 tea pr create \
   --repo "$repo" \
   --head "$user:$tempRemoteBranch" \