diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 8f76372b34b4c16504eecb3ef3ed4b6f0e1f7be4..4635021c40df9e656f7eadd16fdbaf52ea9a6f4a 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2011-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2011-2021  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C)      2019  Mason Hock <mason@masonhock.com>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=16
+VERSION=17
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
 #REPOKEY="871920D1991BC93C"
 
@@ -232,9 +232,9 @@ then
 fi
 
 # Hacks for accessibility
-if pgrep orca > /dev/null
+if [ \$(gsettings get com.canonical.a11y-profile-manager active-profile) == "'blindness'" ]
 then
-  echo "Orca screen reader seems to be running, enabling accessibility by default in target system"
+  echo "Accessibility profile set to 'blindness', enabling screen reader by default in target system"
   echo "[org.mate.applications-at]
 screen-reader-enabled=true
 
@@ -256,9 +256,7 @@ screen-reader=true
   chroot /target glib-compile-schemas /usr/share/glib-2.0/schemas
 
 else 
-  set +e
-  grep -q v3 /proc/cmdline && exit
-  echo "Orca screen reader seems not to be running, disabling accessibility by default in target system"
+  echo "Accessibility profile set to none, disabling screen reader by default in target system"
   rm /target/home/*/.local/share/orca/user-settings.conf -f
 fi