diff --git a/.SRCINFO b/.SRCINFO
index 22777daacfcb1..3b8808964024b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = flutter-bin
 	pkgdesc = Cross platform widget toolkit for Dart (monolithic)
-	pkgver = 3.19.6
-	pkgrel = 5
+	pkgver = 3.22.0
+	pkgrel = 1
 	url = https://github.com/flutter/flutter
 	install = flutter.install
 	arch = x86_64
@@ -39,12 +39,12 @@ pkgbase = flutter-bin
 	conflicts = flutter-material-fonts
 	conflicts = flutter-sky-engine
 	conflicts = flutter-tool-developer
-	noextract = flutter-3.19.6.tar.xz
+	noextract = flutter-3.22.0.tar.xz
 	options = !emptydirs
 	options = !strip
 	options = !debug
-	source = flutter-3.19.6.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.19.6-stable.tar.xz
-	sha256sums = db6742a20626d0d2a089eb41ad61b9b2138b996679911e9c8268c1f896191f97
+	source = flutter-3.22.0.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.22.0-stable.tar.xz
+	sha256sums = de78685478b224caf2c5b4e508892a0d6ddea70777efcac139a59b5588558299
 
 pkgname = flutter-bin
 	depends = clang
diff --git a/PKGBUILD b/PKGBUILD
index 4d5c805e27d39..52a16a8a99f90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname="flutter"
 pkgname="$_pkgname-bin"
-pkgver=3.19.6
-pkgrel=5
+pkgver=3.22.0
+pkgrel=1
 pkgdesc="Cross platform widget toolkit for Dart (monolithic)"
 arch=("x86_64")
 url="https://github.com/flutter/flutter"
@@ -61,7 +61,7 @@ source=(
 )
 
 sha256sums=(
-  'db6742a20626d0d2a089eb41ad61b9b2138b996679911e9c8268c1f896191f97'
+  'de78685478b224caf2c5b4e508892a0d6ddea70777efcac139a59b5588558299'
 )
 
 prepare() {
diff --git a/flutter.install b/flutter.install
index bdae51872631b..64aa3290bfe36 100644
--- a/flutter.install
+++ b/flutter.install
@@ -1,11 +1,19 @@
+_builders=(
+  builder
+  builduser
+  flutteruser
+  main-builder
+)
+
 post_install() {
+  # primary flutter group
   groupadd -f flutter
   setfacl -R -m "g:flutter:rwX" /opt/flutter
 
-  # needed to build with clean chroot scripts
-  for _builder in builduser main-builder; do
-    if grep "$_builder" /etc/passwd > /dev/null; then
-      setfacl -R -m "u:$_builder:rwX" /opt/flutter
+  # clean chroot/container builders
+  for _group in "${_builders[@]}"; do
+    if grep -q "$_group" /etc/passwd > /dev/null; then
+      setfacl -R -m "u:$_group:rwX" /opt/flutter
     fi
   done
 
@@ -18,6 +26,14 @@ post_upgrade() {
 }
 
 post_remove() {
+  # remove extra permissions
+  for _group in "${_builders[@]}"; do
+    if grep -q "group:$_group" <<< $(getfacl -ac /opt/flutter 2>/dev/null); then
+      sudo setfacl -R -x "g:flutter" /opt/flutter
+    fi
+  done
+
+  # leave group to prevent orphan permissions
   echo "The 'flutter' group may be removed, if no longer needed:"
   echo "   sudo groupdel flutter"
 }