diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 87a538a..58b51d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,11 +22,11 @@ jobs:
           #sudo apt-get upgrade -y
           sudo apt-get install python3-virtualenv build-essential
           sudo apt-get install libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev -y
-          sudo apt-get install golang wixl msitools -y
+          sudo apt-get install gccgo-go wixl msitools -y
           sudo pip install hitchkey
       
-      - name: Setup tmate session
-        uses: mxschmitt/action-tmate@v3
+      #- name: Setup tmate session
+        #uses: mxschmitt/action-tmate@v3
 
       - name: Build multiarch
         run: hk multiarch
diff --git a/hitch/key.py b/hitch/key.py
index 3ce574f..a881209 100644
--- a/hitch/key.py
+++ b/hitch/key.py
@@ -212,7 +212,7 @@ def buildhk():
 def dogfoodhk():
     """Compile and install new bootstrap to dogfood."""
     bootstrap_path = DIR.project / "bootstrap"
-    Command("go")("build", "-ldflags=-s -w", "hk.go").in_dir(bootstrap_path).run()
+    Command("go")("build", "hk.go").in_dir(bootstrap_path).run()
     bootstrap_path.joinpath("hk").copy("/home/colm/bin/hk")
     
 @expected(CommandError)
@@ -226,15 +226,15 @@ def multiarch():
 
     go = Command("go").in_dir(bootstrap_path)
     print("Building for linux...")
-    go("build", "-o", "hk-linux-amd64", "-ldflags=-s -w", "hk.go").with_env(GOOS="linux", GOARCH="amd64").run()
+    go("build", "-o", "hk-linux-amd64", "hk.go").with_env(GOOS="linux", GOARCH="amd64").run()
     bootstrap_path.joinpath("hk-linux-amd64").copy(dist_path)
     
     print("Building for mac...")
-    go("build", "-o", "hk-darwin-amd64", "-ldflags=-s -w", "hk.go").with_env(GOOS="darwin", GOARCH="amd64").run()
+    go("build", "-o", "hk-darwin-amd64", "hk.go").with_env(GOOS="darwin", GOARCH="amd64").run()
     bootstrap_path.joinpath("hk-darwin-amd64").copy(dist_path)
     
     print("Building for windows...")
-    go("build", "-o", "hk.exe", "-ldflags=-s -w", "hk.go").with_env(GOOS="linux", GOARCH="amd64").run()
+    go("build", "-o", "hk.exe", "hk.go").with_env(GOOS="linux", GOARCH="amd64").run()
     bootstrap_path.joinpath("hk.exe").copy(dist_path)
     
     print("Building MSI For windows...")