diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index 100bfdda..16ce141b 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -456,14 +456,14 @@ function install_gogs {
     echo "ExecStart=/home/$GOGS_USERNAME/gogs web" >> /etc/systemd/system/gogs.service
     echo 'Restart=always' >> /etc/systemd/system/gogs.service
     echo 'RestartSec=10' >> /etc/systemd/system/gogs.service
-    echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"" >> /etc/systemd/system/gogs.service
+    echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=/home/go/go${GO_VERSION}\"" >> /etc/systemd/system/gogs.service
     echo '' >> /etc/systemd/system/gogs.service
     echo '[Install]' >> /etc/systemd/system/gogs.service
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/gogs.service
 
     systemctl enable gogs
     systemctl daemon-reload
-    systemctl restart gogs
+    systemctl start gogs
 
     if [ ! -d /var/www/$GIT_DOMAIN_NAME ]; then
         mkdir /var/www/$GIT_DOMAIN_NAME
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index e172f903..90164262 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -197,7 +197,7 @@ function upgrade_golang {
         return
     fi
 
-    if ! grep -Fxq "upgrade_golang:$GO_VERSION" $COMPLETION_FILE; then
+    if grep -Fxq "upgrade_golang:$GO_VERSION" $COMPLETION_FILE; then
         return
     fi