diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
index 204b84ed5a40..b098d346f79c 100644
--- a/.github/workflows/android-app.yml
+++ b/.github/workflows/android-app.yml
@@ -206,6 +206,8 @@ jobs:
           RUSTFLAGS: --deny warnings
           BUILD_TYPE: debug
         run: |
+          # Temporary fix to address maybenot.h build issues.
+          cargo install --force cbindgen --version "0.26.0"
           ARCHITECTURES="${{ matrix.abi }}"
           UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
           STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"
diff --git a/build-apk.sh b/build-apk.sh
index e45d4014c9d4..748baa0946b8 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -77,6 +77,14 @@ mkdir -p "app/build/extraAssets"
 mkdir -p "app/build/extraJni"
 popd
 
+# Temporary fix to address maybenot.h (checked in) sometimes needing to be
+# re-generated due to how `make` looks at last-modifications while git neither
+# stores nor consistently sets modification metadata on file checkout.
+#
+# NOTE: The version should match the one used in the checked in
+# maybenot.h file.
+cargo install --force cbindgen --version "0.26.0"
+
 for ARCHITECTURE in ${ARCHITECTURES:-aarch64 armv7 x86_64 i686}; do
     case "$ARCHITECTURE" in
         "x86_64")