diff --git a/setup.sh b/setup.sh
index b156757..af3c2d7 100755
--- a/setup.sh
+++ b/setup.sh
@@ -222,8 +222,18 @@ install_just() {
             ;;
     esac
 
-    local binary_name="just-${arch}-${os}"
-    local download_url="https://github.com/casey/just/releases/latest/download/${binary_name}.tar.gz"
+    # Get latest version from GitHub API
+    log_info "Fetching latest version..."
+    local latest_version=$(curl -fsSL https://api.github.com/repos/casey/just/releases/latest | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/')
+
+    if [ -z "$latest_version" ]; then
+        log_error "Failed to fetch latest version"
+        log_info "Please install just manually: https://github.com/casey/just#installation"
+        exit 1
+    fi
+
+    local binary_name="just-${latest_version}-${arch}-${os}"
+    local download_url="https://github.com/casey/just/releases/download/${latest_version}/${binary_name}.tar.gz"
     local install_dir="$HOME/.local/bin"
 
     # Create install directory