diff --git a/.github/workflows/dargon2_flutter_tests.yml b/.github/workflows/dargon2_flutter_tests.yml
index 85b35c5..b25de2b 100644
--- a/.github/workflows/dargon2_flutter_tests.yml
+++ b/.github/workflows/dargon2_flutter_tests.yml
@@ -2,7 +2,9 @@ name: dargon2_flutter
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
 
 defaults:
   run:
@@ -13,23 +15,23 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
          java-version: '17'
          distribution: 'zulu'
       - name: Gradle cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
           key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
       - name: AVD cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -56,9 +58,9 @@ jobs:
           mv ../../dargon2_flutter_mobile/pubspec.test.yaml ../../dargon2_flutter_mobile/pubspec.yaml
           mv ../../dargon2_flutter_desktop/pubspec.test.yaml ../../dargon2_flutter_desktop/pubspec.yaml
           mv ../../dargon2_flutter_platform_interface/pubspec.test.yaml ../../dargon2_flutter_platform_interface/pubspec.yaml          
-          mv ../../../dargon2_core/pubspec.test.yaml ../../../dargon2_core/pubspec.yaml          
+          mv ../../../dargon2_core/pubspec.test.yaml ../../../dargon2_core/pubspec.yaml
       - name: Run Integration Tests
-        uses: reactivecircus/android-emulator-runner@v2.22.0
+        uses: reactivecircus/android-emulator-runner@v2.30.1
         with:
           api-level: 33
           target: google_apis
@@ -67,10 +69,10 @@ jobs:
           script: flutter test integration_test/
 
   test_ios:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Download Flutter
@@ -85,7 +87,7 @@ jobs:
       - name: Start Simulator
         run: |
           UDID=$(
-          xcrun simctl list devices | grep "iPhone 13 (" | awk -F"[()]" '{print $2}' | awk 'NR==1{print $1}'
+          xcrun simctl list devices | grep "iPhone 15 (" | awk -F"[()]" '{print $2}' | awk 'NR==1{print $1}'
           )
           xcrun simctl boot "${UDID:?No Simulator with this name found}"
       - name: Use Test Pubspec Files
@@ -108,7 +110,7 @@ jobs:
   test_web:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
       - name: Use Test Pubspec Files
         run: |
@@ -146,7 +148,7 @@ jobs:
             FLUTTER_CHANNEL: stable
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Download Flutter
diff --git a/.github/workflows/dargon2_tests.yml b/.github/workflows/dargon2_tests.yml
index e3492d3..684d8ff 100644
--- a/.github/workflows/dargon2_tests.yml
+++ b/.github/workflows/dargon2_tests.yml
@@ -2,7 +2,9 @@ name: dargon2
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
 
 defaults:
   run:
@@ -27,4 +29,4 @@ jobs:
     - name: Install dependencies
       run: dart pub get
     - name: Run tests
-      run: dart pub run test
+      run: dart --enable_deprecated_wait_for test
diff --git a/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml b/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml
index 11f3f11..e339365 100644
--- a/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml
+++ b/dargon2_flutter/dargon2_flutter_desktop/pubspec.yaml
@@ -34,10 +34,13 @@ flutter:
     platforms:
       linux:
         pluginClass: Dargon2FlutterDesktopPlugin
+        ffiPlugin: true
       macos:
         pluginClass: Dargon2FlutterDesktopPlugin
+        ffiPlugin: true
       windows:
         pluginClass: Dargon2FlutterDesktopPlugin
+        ffiPlugin: true
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets:
diff --git a/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties b/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties
index 01a286e..8bc9958 100644
--- a/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dargon2_flutter/dargon2_flutter_mobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml
index ccaf0c4..99f0633 100644
--- a/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml
+++ b/dargon2_flutter/dargon2_flutter_mobile/pubspec.yaml
@@ -33,5 +33,7 @@ flutter:
     platforms:
       android:
         dartPluginClass: DArgon2Mobile
+        ffiPlugin: true
       ios:
         dartPluginClass: DArgon2Mobile
+        ffiPlugin: true