diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml
index aaf4bc9b1..3aacde161 100644
--- a/.github/workflows/spine-godot-v4.yml
+++ b/.github/workflows/spine-godot-v4.yml
@@ -13,8 +13,8 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_EC2_METADATA_DISABLED: true
   EM_VERSION: 3.1.18
-  GODOT_TAG: 4.0-stable
-  GODOT_VERSION: 4.0.stable
+  GODOT_TAG: 4.0.1-stable
+  GODOT_VERSION: 4.0.1.stable
 
 jobs:
 
@@ -41,7 +41,7 @@ jobs:
           path: spine-godot/godot/bin/godot.windows.editor.x86_64.exe
 
   godot-editor-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -135,7 +135,7 @@ jobs:
           path: spine-godot/godot/bin/macos.zip
 
   godot-template-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/spine-godot.yml b/.github/workflows/spine-godot.yml
index fa07106ea..cfe520134 100644
--- a/.github/workflows/spine-godot.yml
+++ b/.github/workflows/spine-godot.yml
@@ -13,8 +13,8 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_EC2_METADATA_DISABLED: true
   EM_VERSION: 3.1.14
-  GODOT_TAG: 3.5.1-stable
-  GODOT_VERSION: 3.5.1.stable
+  GODOT_TAG: 3.5.2-stable
+  GODOT_VERSION: 3.5.2.stable
 
 jobs:
 
@@ -132,7 +132,7 @@ jobs:
           path: spine-godot/godot/bin/osx.zip
 
   godot-template-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with: