diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml
index 839fe5372..16331258a 100644
--- a/.github/workflows/spine-godot.yml
+++ b/.github/workflows/spine-godot.yml
@@ -358,10 +358,12 @@ jobs:
         run: |
           BRANCH=${GITHUB_REF#refs/heads/}
           echo "branch: $BRANCH"
-          zip godot-editor-windows.zip godot.windows.opt.tools.64.exe
-          zip godot-editor-linux.zip godot.x11.opt.tools.64
-          aws s3 cp godot.windows.opt.tools.64.exe s3://spine-godot/$BRANCH/$GODOT_TAG/godot-editor-windows.zip
-          aws s3 cp godot.x11.opt.tools.64 s3://spine-godot/$BRANCH/$GODOT_TAG/godot-editor-linux.zip
+          mv godot.windows.opt.tools.64.exe godot-$BRANCH-$GODOT_TAG.exe
+          mv godot.x11.opt.tools.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/
+          aws s3 cp godot-editor-linux.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
           aws s3 cp godot-editor-macos.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
           echo "$GODOT_VERSION" > version.txt
           ls -lah
diff --git a/spine-godot/README.md b/spine-godot/README.md
index 2bd9bc1a6..44c08cace 100644
--- a/spine-godot/README.md
+++ b/spine-godot/README.md
@@ -31,7 +31,7 @@ We provide prebuilt Godot editor and export template binaries for Godot 3.4.4-st
 * [Godot Editor Windows](https://spine-godot.s3.eu-central-1.amazonaws.com/4.2-beta/3.4.4-stable/godot-editor-windows.zip)
 * [Godot Editor Linux](https://spine-godot.s3.eu-central-1.amazonaws.com/4.2-beta/3.4.4-stable/godot-editor-linux.zip)
 * [Godot Editor macOS](https://spine-godot.s3.eu-central-1.amazonaws.com/4.2-beta/3.4.4-stable/godot-editor-macos.zip)
-* [Godot export templates for Windows, Linux, macOS, Web, Android, iOS](https://spine-godot.s3.eu-central-1.amazonaws.com/4.2-beta/3.4.4-stable/spine-godot-templates-4.2-beta-3.4.4-stable.zip)
+* [Godot export templates for Windows, Linux, macOS, Web, Android, iOS](https://spine-godot.s3.eu-central-1.amazonaws.com/4.2-beta/3.4.4-stable/spine-godot-templates-4.2-beta-3.4.4-stable.tpz)
 
 ### Building the Godot editor and export templates locally