diff --git a/build.bat b/build.bat
index ba53a659..f05963e8 100644
--- a/build.bat
+++ b/build.bat
@@ -53,12 +53,12 @@ cd ..
 
 echo "Compiling Windows"
 set GOOS=windows
-go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-windows-amd64.exe edition/community.go
+go build -ldflags="-s -w" -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-windows-amd64.exe edition/community.go
 
 echo "Compiling Linux"
 set GOOS=linux
-go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-linux-amd64 edition/community.go
+go build -ldflags="-s -w" -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-linux-amd64 edition/community.go
 
 echo "Compiling Darwin"
 set GOOS=darwin
-go build -gcflags=-trimpath=%GOPATH% -asmflags=-trimpath=%GOPATH% -o bin/documize-community-darwin-amd64 edition/community.go
+go build -ldflags="-s -w" -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-darwin-amd64 edition/community.go
diff --git a/build.sh b/build.sh
index 145f0de0..b44ce695 100755
--- a/build.sh
+++ b/build.sh
@@ -49,10 +49,10 @@ for arch in amd64 ; do
     for os in darwin linux windows ; do
         if [ "$os" == "windows" ] ; then
             echo "Compiling documize-community-$os-$arch.exe"
-            env GOOS=$os GOARCH=$arch go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-$os-$arch.exe ./edition/community.go
+            env GOOS=$os GOARCH=$arch GODEBUG=tls13=1 go build -ldflags="-s -w" -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-$os-$arch.exe ./edition/community.go
         else
             echo "Compiling documize-community-$os-$arch"
-            env GOOS=$os GOARCH=$arch go build -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-$os-$arch ./edition/community.go
+            env GOOS=$os GOARCH=$arch GODEBUG=tls13=1 go build -ldflags="-s -w" -gcflags="all=-trimpath=$GOPATH" -o bin/documize-community-$os-$arch ./edition/community.go
         fi
     done
 done