diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aa554495b0..ef25cbcb7b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,7 @@ on:
 name: Build
 
 env:
-  FLUTTER_VERSION: 3.22.0
+  FLUTTER_VERSION: 3.22.1
   XCODE_VERSION: ^15.0.1
 
 jobs:
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
index 4a1ae926d5..4c4b8c8b0e 100644
--- a/.github/workflows/gh-pages.yaml
+++ b/.github/workflows/gh-pages.yaml
@@ -2,7 +2,7 @@ on:
   pull_request:
 
 env:
-  FLUTTER_VERSION: 3.22.0
+  FLUTTER_VERSION: 3.22.1
   LIBOLM_VERSION: 3.2.16
 
 name: Deploying on GitHub Pages
@@ -57,7 +57,6 @@ jobs:
           flutter clean
           flutter pub get
           flutter pub run build_runner build --delete-conflicting-outputs
-          flutter pub get # In flutter 3.22, flutter gen-l10n is not working properly, so we need to run flutter pub get again
           flutter build web --release --verbose --source-maps --base-href="/${GITHUB_REPOSITORY##*/}/$FOLDER/"
           echo "$TWAKE_PREVIEW_CONFIG" | yq '.issue_id = strenv(FOLDER)' > ./build/web/config.json
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index abc893f3eb..3e8b21a022 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -4,7 +4,7 @@ on:
       - "v*.*.*"
 
 env:
-  FLUTTER_VERSION: 3.22.0
+  FLUTTER_VERSION: 3.22.1
   XCODE_VERSION: ^15.0.1
 
 name: Release
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 208c1a5eb3..f62c3ef7a2 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -4,7 +4,7 @@ on:
 name: Tests
 
 env:
-  FLUTTER_VERSION: 3.22.0
+  FLUTTER_VERSION: 3.22.1
 
 jobs:
   code_analyze:
@@ -57,7 +57,6 @@ jobs:
       - name: Run widget test
         run: |
           flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-          flutter pub get # In flutter 3.22, flutter gen-l10n is not working properly, so we need to run flutter pub get again
           flutter test
 
   # integration_test:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a72486b3c8..f65da070a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  FLUTTER_VERSION: 3.22.0
+  FLUTTER_VERSION: 3.22.1
 
 image:
   name: cirrusci/flutter:${FLUTTER_VERSION}
diff --git a/Dockerfile b/Dockerfile
index c245365573..05ab55ae7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Specify versions
-ARG FLUTTER_VERSION=3.22.0
+ARG FLUTTER_VERSION=3.22.1
 ARG OLM_VERSION=3.2.15
 
 # Building libolm
diff --git a/scripts/build-android-apk.sh b/scripts/build-android-apk.sh
index f38c01275b..ca43acc5f2 100755
--- a/scripts/build-android-apk.sh
+++ b/scripts/build-android-apk.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build apk --release
 mkdir -p build/android
 cp build/app/outputs/apk/release/app-release.apk build/android/
diff --git a/scripts/build-android-debug.sh b/scripts/build-android-debug.sh
index 76ef9470fa..f0d5937719 100755
--- a/scripts/build-android-debug.sh
+++ b/scripts/build-android-debug.sh
@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build apk --debug
diff --git a/scripts/build-linux-debug.sh b/scripts/build-linux-debug.sh
index 16871beaa7..cf28ce29e8 100755
--- a/scripts/build-linux-debug.sh
+++ b/scripts/build-linux-debug.sh
@@ -9,5 +9,4 @@ sudo apt-get install -y clang cmake ninja-build \
 flutter config --enable-linux-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build linux --profile -v
diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
index 833ff1c4cf..57f0072e03 100755
--- a/scripts/build-linux.sh
+++ b/scripts/build-linux.sh
@@ -9,5 +9,4 @@ sudo apt-get install -y clang cmake ninja-build \
 flutter config --enable-linux-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build linux --release -v
diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
index 95ba7b5793..ccc113ec7f 100755
--- a/scripts/build-macos.sh
+++ b/scripts/build-macos.sh
@@ -2,7 +2,6 @@
 flutter config --enable-macos-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 cd macos
 bundle exec fastlane sync_dev_id
 pod install --repo-update
diff --git a/scripts/build-web.sh b/scripts/build-web.sh
index c124a7c1b4..1338321493 100755
--- a/scripts/build-web.sh
+++ b/scripts/build-web.sh
@@ -3,6 +3,5 @@ flutter config --enable-web
 flutter clean
 flutter pub get
 flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build web --release --verbose --source-maps --base-href="/web/"
 cp config.sample.json ./build/web/config.json
diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
index 266c377c9d..5e1ea6d12a 100755
--- a/scripts/build-windows.sh
+++ b/scripts/build-windows.sh
@@ -3,7 +3,6 @@ echo "Building for Windows."
 flutter config --enable-windows-desktop
 flutter clean
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build windows --release -v
 
 # Building libolm
diff --git a/scripts/code_analyze.sh b/scripts/code_analyze.sh
index 22d7e8f595..757645616c 100755
--- a/scripts/code_analyze.sh
+++ b/scripts/code_analyze.sh
@@ -1,5 +1,4 @@
 #!/bin/sh -ve
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
 dart format --set-exit-if-changed lib/ test/
-flutter pub get # In flutter 3.22, flutter gen-l10n is not working properly, so we need to run flutter pub get again
 flutter analyze
diff --git a/scripts/prepare-ios.sh b/scripts/prepare-ios.sh
index 0952b314bd..fc43cb8167 100755
--- a/scripts/prepare-ios.sh
+++ b/scripts/prepare-ios.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 # Use alternate beautifier
 brew install xcbeautify
 cd ios
diff --git a/scripts/release-playstore-beta.sh b/scripts/release-playstore-beta.sh
index d44bec5641..b585504182 100755
--- a/scripts/release-playstore-beta.sh
+++ b/scripts/release-playstore-beta.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs
-flutter pub get
 flutter build appbundle --release
 cd android
 bundle exec fastlane deploy_internal_test