diff --git a/data/features/go/go.dat.sh b/data/features/go/go.dat.sh
index f9516b43..8645e51a 100755
--- a/data/features/go/go.dat.sh
+++ b/data/features/go/go.dat.sh
@@ -5,8 +5,8 @@ go_description="google programming language"
 go_version="1.17.linux-amd64"
 go_systemcategories=("Languages")
 go_tags=("search" "customDesktop")
+
 go_downloadkeys=("bundle")
-go_bundle_URL="https://golang.org/dl/go1.17.linux-amd64.tar.gz"
-go_bundle_downloadPath="/usr/local"
-go_flagsoverride="0;;;;;"  # Install always as root
+go_bundle_URL="https://go.dev/dl/go1.22.1.linux-amd64.tar.gz"
 go_bashinitializations=("go.sh")
+pycharm_binariesinstalledpaths=("bin/go;go" "bin/gofmt;gofmt")
diff --git a/data/features/go/go.sh b/data/features/go/go.sh
index 47d3f432..5b1d20a6 100755
--- a/data/features/go/go.sh
+++ b/data/features/go/go.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 
-export GOPATH="€{HOME_FOLDER}/goWorkspace"
-export PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
+export GOPATH="€{HOME_FOLDER}/go"
+export GOROOT="€{CURRENT_INSTALLATION_FOLDER}"
+#export PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"