diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
index 09f2c25..9762b77 100644
--- a/.github/workflows/build-dev.yml
+++ b/.github/workflows/build-dev.yml
@@ -13,11 +13,16 @@ jobs:
       -
         name: Action Checkout
         uses: actions/checkout@v3
+      # -
+      #   name: Setup Tinygo
+      #   uses: acifani/setup-tinygo@v1
+      #   with:
+      #     tinygo-version: '0.35.0'
       -
-        name: Setup Tinygo
-        uses: acifani/setup-tinygo@v1
+        name: Setup Golang
+        uses: actions/setup-go@v4
         with:
-          tinygo-version: '0.35.0'
+          go-version: '1.23.0'
       -
         name: Build wasm
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c20aa78..0227498 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,16 +59,22 @@ jobs:
       -
         name: Action Checkout
         uses: actions/checkout@v3
+      # -
+      #   name: Setup Tinygo
+      #   uses: acifani/setup-tinygo@v1
+      #   with:
+      #     tinygo-version: '0.35.0'
       -
-        name: Setup Tinygo
-        uses: acifani/setup-tinygo@v1
+        name: Setup Golang
+        uses: actions/setup-go@v4
         with:
-          tinygo-version: '0.35.0'
+          go-version: '1.23.0'
       -
         name: Build wasm
         run: |
           mkdir output
-          /usr/bin/env bash ./cmd/mcla_wasm/build.sh -o ./output/mcla.wasm -opt=z -no-debug -ldflags="-X 'main.version=${GITHUB_REF#refs/*/}'"
+          # /usr/bin/env bash ./cmd/mcla_wasm/build.sh -o ./output/mcla.wasm -opt=z -no-debug -ldflags="-X 'main.version=${GITHUB_REF#refs/*/}'"
+          /usr/bin/env bash ./cmd/mcla_wasm/build.sh -o ./output/mcla.wasm -trimpath -ldflags="-s -w -X 'main.version=${GITHUB_REF#refs/*/}'"
           cp ./cmd/mcla_wasm/wasm_exec.js ./output/wasm_exec.js
       -
         name: Upload wasm output to artifact
diff --git a/cmd/mcla_wasm/build.sh b/cmd/mcla_wasm/build.sh
index 417f5b6..226143d 100755
--- a/cmd/mcla_wasm/build.sh
+++ b/cmd/mcla_wasm/build.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-exec tinygo build -target wasm "$@" "$(dirname $0)"
+# exec tinygo build -target wasm "$@" "$(dirname $0)"
+GOOS=js GOARCH=wasm exec go build "$@" "$(dirname $0)"