diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml
index 39fac5596..a02c1d7bd 100644
--- a/.github/workflows/spine-godot-v4.yml
+++ b/.github/workflows/spine-godot-v4.yml
@@ -62,7 +62,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: godot-editor-linux.zip
-          path: spine-godot/godot/bin/godot.linux.editor.x86_64
+          path: spine-godot/godot/bin/godot.linuxbsd.editor.x86_64
 
   godot-editor-macos:
     runs-on: macos-latest
@@ -351,7 +351,7 @@ jobs:
           BRANCH=${GITHUB_REF#refs/heads/}
           echo "branch: $BRANCH"
           mv godot.windows.editor.x86_64.exe godot-$BRANCH-$GODOT_TAG.exe
-          mv godot.linux.editor.x86_64 godot-$BRANCH-$GODOT_TAG
+          mv godot.linuxbsd.editor.x86_64 godot-$BRANCH-$GODOT_TAG
           zip godot-editor-windows.zip godot-$BRANCH-$GODOT_TAG.exe
           zip godot-editor-linux.zip godot-$BRANCH-$GODOT_TAG
           aws s3 cp godot-editor-windows.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
diff --git a/spine-godot/build/build-templates-v4.sh b/spine-godot/build/build-templates-v4.sh
index adae77e93..950fe21c5 100755
--- a/spine-godot/build/build-templates-v4.sh
+++ b/spine-godot/build/build-templates-v4.sh
@@ -110,16 +110,16 @@ elif [ "$platform" = "android" ]; then
 		./gradlew generateGodotTemplates
 	popd
 elif [ "$platform" = "linux" ]; then
-	# --- Linix ---
+	# --- Linux ---
 	# generates linux_x11_64_release, linux_x11_64_debug
 	scons platform=linuxbsd tools=no target=template_release bits=64 custom_modules="../spine_godot" --jobs=$cpus
-	scons platform=linuxbsd tools=no target=template_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus
-	strip bin/godot.x11.opt.64	
-	strip bin/godot.x11.opt.debug.64
-	chmod a+x bin/godot.x11.opt.64
-	chmod a+x bin/godot.x11.opt.debug.64
-	cp bin/godot.x11.opt.64 bin/linux_x11_64_release
-	cp bin/godot.x11.opt.debug.64 bin/linux_x11_64_debug
+	scons platform=linuxbsd tools=no target=template_debug bits=64 custom_modules="../spine_godot" --jobs=$cpus	
+	strip bin/godot.linuxbsd.template_release.64
+	strip bin/godot.linuxbsd.template_debug.64
+	chmod a+x bin/godot.linuxbsd.template_release.64
+	chmod a+x bin/godot.linuxbsd.template_debug.64
+	cp bin/godot.linuxbsd.template_release.64 bin/linux_x11_64_release
+	cp bin/godot.linuxbsd.template_debug.64 bin/linux_x11_64_debug
 else
 	echo "Unknown platform: $platform"
 	exit 1
diff --git a/spine-godot/build/build-v4.sh b/spine-godot/build/build-v4.sh
index b2f3c703e..6d91ec831 100755
--- a/spine-godot/build/build-v4.sh
+++ b/spine-godot/build/build-v4.sh
@@ -49,9 +49,9 @@ else
 	fi
 	scons $target compiledb=yes custom_modules="../spine_godot" --jobs=$cpus	
 	cp compile_commands.json ../build
-	if [ -f "bin/godot.x11.opt.tools.64" ]; then
-		strip bin/godot.x11.opt.tools.64
-		chmod a+x bin/godot.x11.opt.tools.64
+	if [ -f "bin/godot.linuxbsd.editor.x86_64" ]; then
+		strip bin/godot.linuxbsd.editor.x86_64
+		chmod a+x bin/godot.linuxbsd.editor.x86_64
 	fi
 fi
 popd