diff --git a/src/freedombone b/src/freedombone
index 8fbb67f5..f953b5eb 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -6345,9 +6345,11 @@ function install_gogs {
 
     # install Go
     apt-get -y install golang libpam0g-dev
+    export GOPATH=/home/git/go
     if ! grep -q "export GOPATH=/home/git/go" ~/.bashrc; then
         echo 'export GOPATH=/home/git/go' >> ~/.bashrc
-	fi
+    fi
+    systemctl set-environment GOPATH=/home/git/go
     if ! grep -q "systemctl set-environment GOPATH=/home/git/go" ~/.bashrc; then
         echo 'systemctl set-environment GOPATH=/home/git/go' >> ~/.bashrc
     fi
@@ -10085,8 +10087,12 @@ function install_ipfs {
         adduser --disabled-login --gecos 'Gogs' git
 
         # install Go
+        export GOPATH=/home/git/go
         if ! grep -q "export GOPATH=/home/git/go" ~/.bashrc; then
             echo 'export GOPATH=/home/git/go' >> ~/.bashrc
+        fi
+        systemctl set-environment GOPATH=/home/git/go
+        if ! grep -q "systemctl set-environment GOPATH=/home/git/go" ~/.bashrc; then
             echo 'systemctl set-environment GOPATH=/home/git/go' >> ~/.bashrc
         fi
         export GOPATH=/home/git/go