diff --git a/.SRCINFO b/.SRCINFO
index a2cd4da790a44..4a037f6a8a790 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flutter-bin
 	pkgdesc = Cross platform widget toolkit for Dart (monolithic)
-	pkgver = 3.22.1
+	pkgver = 3.22.2
 	pkgrel = 1
 	url = https://github.com/flutter/flutter
 	install = flutter.install
@@ -39,12 +39,12 @@ pkgbase = flutter-bin
 	conflicts = flutter-material-fonts
 	conflicts = flutter-sky-engine
 	conflicts = flutter-tool-developer
-	noextract = flutter-3.22.1.tar.xz
+	noextract = flutter-3.22.2.tar.xz
 	options = !emptydirs
 	options = !strip
 	options = !debug
-	source = flutter-3.22.1.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.22.1-stable.tar.xz
-	sha256sums = fb8ce30fd21d8f43cd2540af6d9f9452cbfc80a85706f26cb072386fc51fbfce
+	source = flutter-3.22.2.tar.xz::https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.22.2-stable.tar.xz
+	sha256sums = 0dc6c112e65e534f2968b44a2d667525fb684bed94c925cac0e7b08b12de45fe
 
 pkgname = flutter-bin
 	depends = clang
diff --git a/PKGBUILD b/PKGBUILD
index b6b498b6eb88f..8e2be02f5f42b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname="flutter"
 pkgname="$_pkgname-bin"
-pkgver=3.22.1
+pkgver=3.22.2
 pkgrel=1
 pkgdesc="Cross platform widget toolkit for Dart (monolithic)"
 arch=("x86_64")
@@ -61,7 +61,7 @@ source=(
 )
 
 sha256sums=(
-  'fb8ce30fd21d8f43cd2540af6d9f9452cbfc80a85706f26cb072386fc51fbfce'
+  '0dc6c112e65e534f2968b44a2d667525fb684bed94c925cac0e7b08b12de45fe'
 )
 
 prepare() {
diff --git a/flutter.install b/flutter.install
index e648b857b5f97..829e2c21a29d1 100644
--- a/flutter.install
+++ b/flutter.install
@@ -1,19 +1,28 @@
 _builders=(
   builder
   builduser
-  flutteruser
   main-builder
 )
 
+_groups=(
+  flutter
+  flutteruser
+)
+
 post_install() {
   # primary flutter group
   groupadd -f flutter
-  setfacl -R -m "g:flutter:rwX" /opt/flutter
+
+  for i in "${_groups[@]}"; do
+    if grep -q "$i" /etc/passwd > /dev/null; then
+      setfacl -R -m "g:$i:rwX" /opt/flutter
+    fi
+  done
 
   # 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
+  for i in "${_builders[@]}"; do
+    if grep -q "$i" /etc/passwd > /dev/null; then
+      setfacl -R -m "u:$i:rwX" /opt/flutter
     fi
   done
 
@@ -25,14 +34,29 @@ post_upgrade() {
   post_install
 }
 
-post_remove() {
+pre_install() {
+  chmod -R go-w opt/flutter
+}
+
+pre_upgrade() {
+  chmod -R go-w opt/flutter
+}
+
+pre_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
+  for i in ${_builders[@]} ${_groups[@]}; do
+    if grep -q "group:$i" <<< $(getfacl -ac /opt/flutter 2> /dev/null); then
+      sudo setfacl -R -x "g:$i" /opt/flutter
+    fi
+    if grep -q "user:$i" <<< $(getfacl -ac /opt/flutter 2> /dev/null); then
+      sudo setfacl -R -x "u:$i" /opt/flutter
     fi
   done
 
+  chmod -R go-w opt/flutter
+}
+
+post_remove() {
   # leave opt directory to prevent data loss
   echo "The 'flutter' directory may be removed, if not needed:"
   echo "   sudo \rm -rf /opt/flutter"