diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml
index 93b3cea58..aa101ef1b 100644
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@@ -106,6 +106,7 @@ glutin = {}
 gnu-binutils = {}
 gnu-grep = {}
 gnu-make = {}
+go = {}
 goaccess = {}
 gobject-introspection = {}
 gitoxide = {}
@@ -126,6 +127,7 @@ intel-one-mono = {}
 ion = {}
 kernel = {}
 kibi = {}
+lazygit = {}
 lci = {}
 libarchive = {}
 libatomic = {}
diff --git a/recipes/wip/dev/git-tools/lazygit/recipe.toml b/recipes/wip/dev/git-tools/lazygit/recipe.toml
index 1cdac8ff3..4a2442f2e 100644
--- a/recipes/wip/dev/git-tools/lazygit/recipe.toml
+++ b/recipes/wip/dev/git-tools/lazygit/recipe.toml
@@ -1,7 +1,9 @@
-#TODO: Incomplete std/syscall porting, or vendor patches
+#TODO: require git update
 [source]
-git = "https://github.com/jesseduffield/lazygit"
+git = "https://github.com/willnode/lazygit"
+branch = "redox"
 shallow_clone = true
+
 [build]
 template = "custom"
 dev-dependencies = [
@@ -21,3 +23,8 @@ esac
 mkdir -p $COOKBOOK_STAGE/usr/bin
 go build -C ${COOKBOOK_SOURCE} -o $COOKBOOK_STAGE/usr/bin/lazygit
 """
+
+[package]
+dependencies = [
+    "git"
+]
diff --git a/recipes/wip/dev/lang/go/recipe.toml b/recipes/wip/dev/lang/go/recipe.toml
index c2640102f..8d6e4151a 100644
--- a/recipes/wip/dev/lang/go/recipe.toml
+++ b/recipes/wip/dev/lang/go/recipe.toml
@@ -7,6 +7,7 @@ shallow_clone = true
 [build]
 template = "custom"
 script = """
+COOKBOOK_NOSTRIP=1
 export PATH=$HOME/.local/go/bin:$PATH
 
 export GOPATH=${COOKBOOK_BUILD}/gopath
@@ -31,7 +32,7 @@ case "${TARGET}" in
     riscv64gc-unknown-redox) export GOARCH=riscv64 GOOS=redox;;
 esac
 
-export CGO_ENABLED=1
+export CC=gcc CXX=g++ CGO_ENABLED=0
 echo "go1.27.3" > VERSION # to set -trimpath
 (cd ./src && bash ./make.bash)