diff --git a/git-hangman-lab/scripts/create-pr b/git-hangman-lab/scripts/create-pr
index 64c1b98..6841682 100755
--- a/git-hangman-lab/scripts/create-pr
+++ b/git-hangman-lab/scripts/create-pr
@@ -40,8 +40,8 @@ if ! secret-mgr list 2>/dev/null | grep -q "git-access-token"; then
   "$SCRIPT_DIR/generate-access-token"
 fi
 
-# Get the access token
-GIT_TOKEN="$(secret-mgr get-secret --key git-access-token)"
+# Get the access token (extract actual token from "Access token was successfully created: <token>")
+GIT_TOKEN="$(secret-mgr get-secret --key git-access-token | awk '{print $NF}')"
 
 if [[ -z "$GIT_TOKEN" ]]; then
   echo "Error: Failed to get git-access-token"
diff --git a/git-hangman-lab/scripts/generate-access-token b/git-hangman-lab/scripts/generate-access-token
index 94e660a..da3e4ef 100755
--- a/git-hangman-lab/scripts/generate-access-token
+++ b/git-hangman-lab/scripts/generate-access-token
@@ -7,7 +7,10 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 "$SCRIPT_DIR/check-git-cred"
 
 username=$(secret-mgr get-username --key git)
-token=$("$SCRIPT_DIR/gitea" admin user generate-access-token --username "$username" --token-name "$username")
+token_output=$("$SCRIPT_DIR/gitea" admin user generate-access-token --username "$username" --token-name "$username")
+
+# Extract token from output (format: "Access token was successfully created: <token>")
+token=$(echo "$token_output" | awk '{print $NF}')
 
 secret-mgr set --key git-access-token --username "$username" --secret "$token"