diff --git a/helpers/DATA/casper/35-apparmor-abrowser b/helpers/DATA/casper/35apparmor_abrowser
similarity index 54%
rename from helpers/DATA/casper/35-apparmor-abrowser
rename to helpers/DATA/casper/35apparmor_abrowser
index 8823109..dffa611 100644
--- a/helpers/DATA/casper/35-apparmor-abrowser
+++ b/helpers/DATA/casper/35apparmor_abrowser
@@ -20,6 +20,11 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-chroot /root /sbin/apparmor_parser -r /etc/apparmor.d/abrowser
+cat << EOF > /root/etc/rc.local
+#!/bin/sh
+# Enable apparmor profile during live session to allow Abrowser to create user namespaces
+[ -d /rofs ] && apparmor_parser -a /etc/apparmor.d/abrowser
+EOF
+chmod 755 /root/etc/rc.local
 
 log_end_msg
diff --git a/helpers/make-casper b/helpers/make-casper
index 8ff34b1..78b37a2 100644
--- a/helpers/make-casper
+++ b/helpers/make-casper
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=21
+VERSION=22
 
 . ./config
 
@@ -44,8 +44,8 @@ sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
 patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch
 
 # Enable abrowser apparmor profile
-cp $DATA/35-apparmor-abrowser scripts/casper-bottom
-chmod 755 scripts/casper-bottom/35-apparmor-abrowser
+cp $DATA/35apparmor_abrowser scripts/casper-bottom
+chmod 755 scripts/casper-bottom/35apparmor_abrowser
 
 changelog "Compiled for Trisquel"