diff --git a/roles/home-cli/files/profile b/roles/home-cli/files/profile
index 782cd42..8294e8b 100644
--- a/roles/home-cli/files/profile
+++ b/roles/home-cli/files/profile
@@ -279,22 +279,9 @@ then
 fi
 
 # Set up Go.
-if [ -x "$ACP/opt/go/bin/go" ] || [ -x /usr/bin/go ] || [ -x /usr/local/bin/go ]
+if command -v go >/dev/null
 then
-    export GOPROXY=https://proxy.golang.org
-    export GOPATH="$XDG_DATA_HOME/go"
-    if [ ! -d "$GOPATH" ]
-    then
-        mkdir -p "$GOPATH/bin"
-        mkdir -p "$GOPATH/pkg"
-        mkdir -p "$GOPATH/src"
-    fi
-    if [ -x "$ACP/opt/go/bin/go" ]
-    then
-        export GOROOT="$ACP/opt/go"
-        _acp_add_path "$GOROOT/bin"
-    fi
-    _acp_add_path "$GOPATH/bin"
+    _acp_add_path "$(go env GOPATH)"
 fi
 
 # Basic and extra prun (podman run) aliases.