diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml
index 0f268be..f0665d3 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           cache: true
           channel: stable
-          flutter-version: 3.41.0
+          flutter-version: 3.44.0
 
       - name: Install dependencies & Activate as global executable
         run: |
@@ -51,7 +51,7 @@ jobs:
       - name: Run flutterpi_tool build
         working-directory: test_app
         env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
         run: |
           echo '::group::flutterpi_tool build ... --debug-unoptimized'
           flutterpi_tool build --arch=${{ matrix.arch }} --cpu=${{ matrix.cpu }} --debug-unoptimized --debug-symbols --verbose
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
index d9779b5..675a19f 100644
--- a/.github/workflows/flutter.yml
+++ b/.github/workflows/flutter.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      GITHUB_TOKEN: ${{ secrets.TOKEN }}
+      GITHUB_TOKEN: ${{ github.token }}
     steps:
       - uses: actions/checkout@v4
 
@@ -26,7 +26,7 @@ jobs:
         with:
           cache: true
           channel: stable
-          flutter-version: 3.41.0
+          flutter-version: 3.44.0
 
       - name: Install dependencies
         run: flutter pub get
diff --git a/lib/src/build_system/build_app.dart b/lib/src/build_system/build_app.dart
index a0390e1..b1223af 100644
--- a/lib/src/build_system/build_app.dart
+++ b/lib/src/build_system/build_app.dart
@@ -177,7 +177,8 @@ class AppBuilder {
       FlutterpiTargetPlatform.genericRiscv64 => 'riscv64',
       FlutterpiTargetPlatform.genericAArch64 ||
       FlutterpiTargetPlatform.pi3_64 ||
-      FlutterpiTargetPlatform.pi4_64 =>
+      FlutterpiTargetPlatform.pi4_64 ||
+      FlutterpiTargetPlatform.pi5_64 =>
         'arm64',
       FlutterpiTargetPlatform.genericArmV7 ||
       FlutterpiTargetPlatform.pi3 ||
diff --git a/lib/src/more_os_utils.dart b/lib/src/more_os_utils.dart
index b44974c..6b2fdb3 100644
--- a/lib/src/more_os_utils.dart
+++ b/lib/src/more_os_utils.dart
@@ -87,7 +87,7 @@ class MoreOperatingSystemUtilsWrapper implements MoreOperatingSystemUtils {
       HostPlatform.linux_arm64 => FlutterpiHostPlatform.linuxARM64,
       HostPlatform.windows_x64 => FlutterpiHostPlatform.windowsX64,
       HostPlatform.windows_arm64 => FlutterpiHostPlatform.windowsARM64,
-      _ => throw UnsupportedError('Unsupported host platform: $hostPlatform'),
+      HostPlatform.linux_riscv64 => FlutterpiHostPlatform.linuxRV64,
     };
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 29a417b..faf36cf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,7 +5,7 @@ repository: https://github.com/ardera/flutterpi_tool
 
 environment:
   sdk: ^3.0.5
-  flutter: ">=3.41.0"
+  flutter: ">=3.44.0"
 
 executables:
   # TODO(ardera): Maybe add an alias `flutterpi-tool` here?