diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 4046725..75fbf3b 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -129,9 +129,9 @@ if [ -f "$HOME/shell/completions/backup-scripts-completion.bash" ]; then
 fi
 
 # Go environment variables (required for Fabric and other Go tools)
-export GOROOT=/usr/local/go
+# GOROOT is auto-detected by Go when installed via package manager
 export GOPATH=$HOME/go
-export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
+export PATH=$GOPATH/bin:$PATH
 
 # Fabric AI - Pattern aliases and helper functions
 if command -v fabric &> /dev/null; then
diff --git a/setup/packages.list b/setup/packages.list
index df8a2e8..3c136ca 100644
--- a/setup/packages.list
+++ b/setup/packages.list
@@ -3,6 +3,7 @@
 
 // Core tools
 git
+golang-go
 python3
 wget
 curl
diff --git a/setup/setup.sh b/setup/setup.sh
index 7a31906..dc8e61b 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -246,21 +246,17 @@ echo -e "${GREEN}Package installation completed for $OS_NAME $OS_VERSION.${NC}"
 # Install Go if not present (required for Fabric and other Go tools)
 echo -e "${YELLOW}Checking Go installation...${NC}"
 if ! command -v go &> /dev/null; then
-    echo -e "${YELLOW}Installing Go programming language...${NC}"
-    GO_VERSION="1.21.5"  # Stable version that works well with Fabric
+    echo -e "${YELLOW}Installing Go programming language via package manager...${NC}"
 
-    # Download and install Go
-    wget -q "https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz" -O /tmp/go.tar.gz
+    # Install Go via package manager (preferred approach)
+    if command -v nala &> /dev/null; then
+        sudo nala install -y golang-go
+    else
+        sudo apt update && sudo apt install -y golang-go
+    fi
 
-    # Remove any existing Go installation
-    sudo rm -rf /usr/local/go
-
-    # Extract Go to /usr/local
-    sudo tar -C /usr/local -xzf /tmp/go.tar.gz
-    rm /tmp/go.tar.gz
-
-    echo -e "${GREEN}Go ${GO_VERSION} installed successfully!${NC}"
-    echo -e "${YELLOW}Go PATH will be configured in shell configuration${NC}"
+    echo -e "${GREEN}Go installed successfully via package manager!${NC}"
+    echo -e "${YELLOW}GOROOT will be auto-detected, GOPATH configured in shell${NC}"
 else
     echo -e "${GREEN}Go is already installed: $(go version)${NC}"
 fi
@@ -370,7 +366,10 @@ FABRIC_EOF
 done
 
 # Setup Ollama with Docker for local AI (required for Fabric)
-echo -e "${YELLOW}Setting up Ollama with Docker for local AI support...${NC}"
+if [ "${SKIP_OLLAMA:-false}" = "true" ]; then
+    echo -e "${YELLOW}Skipping Ollama installation (SKIP_OLLAMA=true)${NC}"
+else
+    echo -e "${YELLOW}Setting up Ollama with Docker for local AI support...${NC}"
 
 # Check if user can run docker commands without sudo
 if docker ps >/dev/null 2>&1; then
@@ -515,6 +514,7 @@ FABRIC_CONFIG_EOF
 if docker ps | grep -q ollama; then
     configure_fabric_for_ollama
 fi
+fi  # End SKIP_OLLAMA check
 
 # Install Zsh if not already installed
 echo -e "${YELLOW}Installing Zsh...${NC}"