diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e9d75d0..03eafee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,7 +57,7 @@ jobs:
           echo "${{ secrets.ANDROID_KEY_PASSWORD }}" > key_password.txt
 
           # Use full path to zipalign
-          export ZIPALIGN=$ANDROID_HOME/build-tools/33.0.0/zipalign
+          export ZIPALIGN=$ANDROID_HOME/build-tools/35.0.0/zipalign
 
           for apk in build/app/outputs/flutter-apk/*-release.apk; do
             [ -f "$apk" ] || continue
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b64fb3..008370b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,5 +11,7 @@ jobs:
 
       - name: Build SampleApplication
         run:  |
-            ls -a $ANDROID_HOME/build-tools/35.0.0
-            zipalign.sh --no-daemon build
\ No newline at end of file
+            LATEST_BUILD_TOOLS=$(ls $ANDROID_HOME/build-tools | sort -V | tail -n 1)
+            ZIPALIGN="$ANDROID_HOME/build-tools/$LATEST_BUILD_TOOLS/zipalign"
+    
+            echo "Using zipalign from: $ZIPALIGN"
\ No newline at end of file