diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 675bc8acfd893034c41564f50466e3615a501f69..11d9a4d908dd0fbf59a3e13c5a475ed4c0cddc36 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2011-2017  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2011-2018  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -229,21 +229,20 @@ fi
 if pgrep orca > /dev/null
 then
   echo "Orca screen reader seems to be running, enabling accessibility by default in target system"
-  echo "[org.gnome.desktop.a11y.applications]
+  echo "[org.mate.applications-at]
 screen-reader-enabled=true
 
-[org.gnome.desktop.interface]
-toolkit-accessibility=true
+[org.mate.applications-at-visual]
+startup=true
+
+[org.mate.interface]
+accessibility=true
 
 [com.canonical.unity-greeter]
 screen-reader=true
 " >> /target/usr/share/glib-2.0/schemas/99_accessibility.gschema.override
   chroot /target glib-compile-schemas /usr/share/glib-2.0/schemas
 
- echo "/desktop/gnome/applications/at/screen_reader_enabled true
-/desktop/gnome/interface/accessibility true" > /target/usr/share/gconf/defaults/91_accessibility
- chroot /target update-gconf-defaults
-
 else 
   set +e
   grep -q v3 /proc/cmdline && exit