diff --git a/make.sh b/make.sh
index f90d8a4e27db017f01f2257557722126821994a1..3735b4501a01d39b5e36bb8cdf5640dfb687929e 100755
--- a/make.sh
+++ b/make.sh
@@ -9,7 +9,7 @@ set -x
 
 # Nastaveni promennych, pokud je SINVERSION zakomentovana, pokusime se odhadnout nejnovejsi
 export DEBIAN_FRONTEND=noninteractive
-export GOVERSION=1.17.5 OS=linux ARCH=amd64
+#export GOVERSION=go1.17.6 OS=linux ARCH=amd64
 #export SINVERSION=3.9.2
 
 # Nacteni promennych o bezicim systemu vcetne verzi
@@ -37,14 +37,15 @@ apt install -yqqq build-essential dpkg-dev debhelper build-essential libssl-dev
 
 # Automaticka detekce posledni releasnute verze
 SINVERSION=${SINVERSION:-$(curl -s https://github.com/sylabs/singularity/releases/latest | grep -Po "\/v\K[^\"]+")}
+GOVERSION=${GOVERSION:-$(curl -s https://go.dev/VERSION?m=text)}
 
 # Priprava adresare pro hotove balicky a zapamatovani cesty
 mkdir build
 export BUILD=${PWD}/build
 
 # Stazeni a instalace GO
-wget -q -O /tmp/go${GOVERSION}.${OS}-${ARCH}.tar.gz https://dl.google.com/go/go${GOVERSION}.${OS}-${ARCH}.tar.gz && tar -C /usr/local -xzf /tmp/go${GOVERSION}.${OS}-${ARCH}.tar.gz
-rm /tmp/go${GOVERSION}.${OS}-${ARCH}.tar.gz
+wget -q -O /tmp/${GOVERSION}.${OS}-${ARCH}.tar.gz https://dl.google.com/go/${GOVERSION}.${OS}-${ARCH}.tar.gz && tar -C /usr/local -xzf /tmp/${GOVERSION}.${OS}-${ARCH}.tar.gz
+rm /tmp/${GOVERSION}.${OS}-${ARCH}.tar.gz
 
 # Nastaveni promennych GO
 echo 'export GOPATH=${HOME}/go' >> ~/.bashrc