diff --git a/.github/workflows/spine-godot-extension-v4.yml b/.github/workflows/spine-godot-extension-v4.yml
index 0ab0521ef..f54dc1ba3 100644
--- a/.github/workflows/spine-godot-extension-v4.yml
+++ b/.github/workflows/spine-godot-extension-v4.yml
@@ -160,19 +160,27 @@ jobs:
           sudo apt-get update
 
       - name: Set up Java 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 17
 
+      - name: Setup Android SDK & NDK
+        uses: android-actions/setup-android@v2
+
+      - name: Install NDK
+        run: |
+          yes | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --licenses
+          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;23.2.8568313"
+
       - name: Setup python and scons
         uses: ./.github/actions/setup-godot-deps-4
 
       - name: Build GDExtension
         run: |
           cd spine-godot/build
-          ./setup-extension.sh $GODOT_TAG $DEV_BUILD
-          ./build-extension.sh android
-          ./build-extension.sh android x86_64
+          ./setup-extension.sh $GODOT_TAG $DEV
+          ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/23.2.8568313 ./build-extension.sh android
+          ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/23.2.8568313 ./build-extension.sh android x86_64
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/spine-godot-v4.yml b/.github/workflows/spine-godot-v4.yml
index ee7d212d1..8a60a017c 100644
--- a/.github/workflows/spine-godot-v4.yml
+++ b/.github/workflows/spine-godot-v4.yml
@@ -232,9 +232,10 @@ jobs:
           sudo cp -f spine-godot/build/sources.lst /etc/apt/sources.list
           sudo apt-get update
 
-      - name: Set up Java 11
-        uses: actions/setup-java@v1
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 17
 
       - name: Setup python and scons