diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml
index fc0df2c00..ecb82bf36 100644
--- a/.github/workflows/spine-godot.yml
+++ b/.github/workflows/spine-godot.yml
@@ -40,11 +40,9 @@ jobs:
 
       - name: Build Godot artifact
         shell: bash
-        run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/godot.windows.opt.tools.64.exe
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build.sh release_debug
+        run: |          
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build.sh release_debug
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -64,11 +62,9 @@ jobs:
 
       - name: Build Godot artifact
         shell: bash
-        run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/godot.x11.opt.tools.64
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build.sh release_debug
+        run: |          
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build.sh release_debug
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -89,13 +85,11 @@ jobs:
       - name: Build Godot artifact
         shell: bash
         run: |
-          mkdir -p spine-godot/godot/bin/
-          mkdir -p spine-godot/godot/bin/Godot.app
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build.sh release_debug
           pushd spine-godot/godot/bin
           zip -r godot-editor-macos.zip Godot.app
           popd
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build.sh release_debug
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -114,11 +108,9 @@ jobs:
         uses: ./.github/actions/setup-godot-deps   
 
       - name: Build Godot artifact
-        run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/iphone.zip
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh ios
+        run: |          
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh ios
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -137,11 +129,9 @@ jobs:
         uses: ./.github/actions/setup-godot-deps   
 
       - name: Build Godot artifact
-        run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/osx.zip
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh macos
+        run: |          
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh macos
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
@@ -161,12 +151,9 @@ jobs:
 
       - name: Build Godot artifact
         run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/linux_x11_64_debug
-          touch spine-godot/godot/bin/linux_x11_64_release
-        # sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh linux
+          sudo apt-get install build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libudev-dev libxi-dev libxrandr-dev
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh linux
 
       - name: Upload artifacts debug
         uses: actions/upload-artifact@v2
@@ -193,11 +180,8 @@ jobs:
       - name: Build Godot artifact
         shell: bash
         run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/windows_64_debug.exe
-          touch spine-godot/godot/bin/windows_64_release.exe
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh windows
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh windows
 
       - name: Upload artifacts debug
         uses: actions/upload-artifact@v2
@@ -236,12 +220,8 @@ jobs:
       - name: Build Godot artifact
         shell: bash
         run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/android_release.apk
-          touch spine-godot/godot/bin/android_debug.apk
-          touch spine-godot/godot/bin/android_source.zip
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh android
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh android
 
       - name: Upload artifacts debug
         uses: actions/upload-artifact@v2
@@ -281,12 +261,9 @@ jobs:
         uses: ./.github/actions/setup-godot-deps   
 
       - name: Build Godot artifact
-        run: |
-          mkdir -p spine-godot/godot/bin/
-          touch spine-godot/godot/bin/webassembly_debug.zip
-          touch spine-godot/godot/bin/webassembly_release.zip        
-        # ./spine-godot/build/setup.sh $GODOT_TAG false
-        # ./spine-godot/build/build-templates.sh web
+        run: |          
+          ./spine-godot/build/setup.sh $GODOT_TAG false
+          ./spine-godot/build/build-templates.sh web
 
       - name: Upload artifacts debug
         uses: actions/upload-artifact@v2
@@ -380,8 +357,8 @@ jobs:
         run: |
           BRANCH=${GITHUB_REF#refs/heads/}
           echo "branch: $BRANCH"
-          aws s3 cp godot.windows.opt.tools.64.exe s3://spine-godot/$BRANCH/$GODOT_TAG/
-          aws s3 cp godot.x11.opt.tools.64 s3://spine-godot/$BRANCH/$GODOT_TAG/
+          aws s3 cp godot.windows.opt.tools.64.exe s3://spine-godot/$BRANCH/$GODOT_TAG/godot-editor-windows.exe
+          aws s3 cp godot.x11.opt.tools.64 s3://spine-godot/$BRANCH/$GODOT_TAG/godot-editor-linux
           aws s3 cp godot-editor-macos.zip s3://spine-godot/$BRANCH/$GODOT_TAG/
           echo "$GODOT_VERSION" > version.txt
           ls -lah