diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f66a64..e49e679 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   test_image:
     permissions:
diff --git a/.github/workflows/update_flutter_dependencies.yml b/.github/workflows/update_flutter_dependencies.yml
index c7b26e5..6d123bc 100644
--- a/.github/workflows/update_flutter_dependencies.yml
+++ b/.github/workflows/update_flutter_dependencies.yml
@@ -96,6 +96,7 @@ jobs:
         run: |
           echo "COMMIT_MESSAGE=chore: update flutter dependencies in version.json for ${{ env.FLUTTER_VERSION }}" >> $GITHUB_ENV
 
+      # TODO: Generate changelog for the new flutter version, that will be the new tag
       - name: Create pull request if there are changes
         uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
         with:
diff --git a/script/update_changelog.sh b/script/update_changelog.sh
index fbaedbb..810f93f 100644
--- a/script/update_changelog.sh
+++ b/script/update_changelog.sh
@@ -1 +1,3 @@
+# TODO: Add image registry URLs to the release changelog
+
 npx git-cliff -t 3.29.1 -c github-keepachangelog -o changelog.md
diff --git a/script/update_test.sh b/script/update_test.sh
index 84e19d5..c7b8d17 100755
--- a/script/update_test.sh
+++ b/script/update_test.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 
+# TODO: Update all versions used in android.yml from version.json, like NDK, CMake, etc.
+
 # Path to the JSON and YAML files
 version_file_path="./config/version.json"
 test_file_path="./test/android.yml"
diff --git a/test/android.yml b/test/android.yml
index 08fd6fe..06b600a 100644
--- a/test/android.yml
+++ b/test/android.yml
@@ -31,6 +31,12 @@ commandTests:
       - /home/flutter/sdks/android-sdk/ndk
     expectedOutput:
       - 26.3.11579264
+  - name: CMake is pinned
+    command: ls
+    args:
+      - /home/flutter/sdks/android-sdk/cmake
+    expectedOutput:
+      - 3.22.1
   - name: Android SDK build tools directory only has one directory
     command: bash
     args: