diff --git a/.github/workflows/android-cts-build.yml b/.github/workflows/android-cts-build.yml
index d354f225..f7e0afad 100644
--- a/.github/workflows/android-cts-build.yml
+++ b/.github/workflows/android-cts-build.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023, Collabora, Ltd.
+# Copyright 2021-2024, Collabora, Ltd.
 # SPDX-License-Identifier: CC0-1.0
 
 name: Android OpenXR-CTS - Android Build
@@ -24,7 +24,7 @@ jobs:
           lfs: true
 
       - name: Get modern CMake and Ninja
-        uses: lukka/get-cmake@v3.28.3
+        uses: lukka/get-cmake@v3.29.5
 
       - name: set up JDK 11
         uses: actions/setup-java@v4
@@ -33,10 +33,10 @@ jobs:
           distribution: "temurin"
           cache: gradle
 
-      - uses: gradle/gradle-build-action@v2.10.0
-        with:
-          arguments: ${{ inputs.gradleTask }}
-          build-root-directory: src/conformance
+      - uses: "gradle/actions/setup-gradle@v3"
+
+      - name: "Build with Gradle"
+        run: "cd src/conformance && ./gradlew ${{ inputs.gradleTask }}"
 
       - name: Upload unsigned artifacts
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/android-cts-pr.yml b/.github/workflows/android-cts-pr.yml
index 7f33a400..f94a4e93 100644
--- a/.github/workflows/android-cts-pr.yml
+++ b/.github/workflows/android-cts-pr.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023, Collabora, Ltd.
+# Copyright 2021-2024, Collabora, Ltd.
 # SPDX-License-Identifier: CC0-1.0
 
 name: Android OpenXR-CTS
@@ -11,7 +11,7 @@ on:
       - "devel"
 
 jobs:
-  build-loader:
+  build-cts-pr:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,7 +19,7 @@ jobs:
           lfs: true
 
       - name: Get modern CMake and Ninja
-        uses: lukka/get-cmake@v3.28.3
+        uses: lukka/get-cmake@v3.29.5
 
       - name: set up JDK 11
         uses: actions/setup-java@v4
@@ -28,10 +28,10 @@ jobs:
           distribution: "temurin"
           cache: gradle
 
-      - uses: gradle/gradle-build-action@v2.10.0
-        with:
-          arguments: assembleDebug
-          build-root-directory: src/conformance
+      - uses: "gradle/actions/setup-gradle@v3"
+
+      - name: "Build with Gradle"
+        run: "cd src/conformance && ./gradlew assembleDebug"
 
       - name: Upload OpenXR-CTS Android
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/android-cts-release.yml b/.github/workflows/android-cts-release.yml
deleted file mode 100644
index e6f13193..00000000
--- a/.github/workflows/android-cts-release.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2021-2023, Collabora, Ltd.
-# SPDX-License-Identifier: CC0-1.0
-
-name: Android OpenXR-CTS - Release
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-  # CTS
-  android-build:
-    uses: ./.github/workflows/android-cts-build.yml
-    with:
-      gradleTask: assembleRelease
-      gradleOutputDir: src/conformance/build/outputs/apk/release
-
-  sign-and-publish:
-    if: startsWith(github.ref, 'refs/tags/')
-    needs:
-      - android-build
-    env:
-      # SIGNED_FILE: ${{ steps.sign_cts.outputs.signedReleaseFile }}
-
-      TAGNAME: "${{ github.event.release.tag_name }}"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Retrieve artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: android-openxr-cts-unsigned
-          path: src/conformance/build/outputs/apk/release
-
-      - name: Sign OpenXR-CTS Android release
-        uses: r0adkll/sign-android-release@349ebdef58775b1e0d8099458af0816dc79b6407
-        id: sign_cts
-        with:
-          releaseDirectory: src/conformance/build/outputs/apk/release
-          signingKeyBase64: "${{ secrets.APK_SIGNING_KEY }}"
-          alias: "${{ secrets.APK_ALIAS }}"
-          keyStorePassword: "${{ secrets.APK_KEY_STORE_PASSWORD }}"
-          keyPassword: "${{ secrets.APK_KEY_PASSWORD }}"
-        env:
-          BUILD_TOOLS_VERSION: "30.0.3"
-
-      - name: Rename APK
-        env:
-          SIGNED_FILE: "${{ steps.sign_cts.outputs.signedReleaseFile }}"
-        run: mv $SIGNED_FILE $TAGNAME.apk
-
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: "${{ github.event.release.tag_name }}.apk"