diff --git a/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup b/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup
index 456d03b31e48775717a17b6b63ce6b4de447c3f7..91a41f74f0f60d7aeee9d1e703de2d64baa0671e 100644
--- a/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup
+++ b/config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup
@@ -1,4 +1,4 @@
-Cmnd_Alias PERSISTENCE_SETUP = /usr/bin/tails-persistence-setup "", /usr/bin/tails-persistence-setup --verbose, /usr/bin/tails-persistence-setup --step delete, /usr/bin/tails-persistence-setup --step delete --verbose, /usr/bin/tails-persistence-setup --force-enable-preset AdditionalSoftware
+Cmnd_Alias PERSISTENCE_SETUP = /usr/bin/tails-persistence-setup "", /usr/bin/tails-persistence-setup --verbose, /usr/bin/tails-persistence-setup --step delete, /usr/bin/tails-persistence-setup --step delete --verbose, /usr/bin/tails-persistence-setup --force_enable_preset AdditionalSoftware
 
 amnesia                 ALL = (tails-persistence-setup)   NOPASSWD: PERSISTENCE_SETUP
 tails-persistence-setup ALL = (root)                      NOPASSWD: /usr/bin/tails-fix-persistent-volume-permissions ""
diff --git a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
index 41e003167379b4cb43669f7144df4db67cd46809..b03d60aefcc42602d895fbe58ae94a022870e2b0 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
+++ b/config/chroot_local-includes/usr/local/bin/tails-additional-software-config
@@ -109,7 +109,7 @@ class ASPConfigApplicationWindow(Gtk.ApplicationWindow):
         dialog.destroy()
 
     def cb_persistence_button_clicked(self, button, data=None):
-        launch_persistence_setup("--force-enable-preset", "AdditionalSoftware")
+        launch_persistence_setup("--force_enable_preset", "AdditionalSoftware")
         self.update_packages_list()
         return True
 
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index 4c3379e92ae43f0f34ce9e7ca1a4a4b0bd1c2230..2e4bacbb8a1cc7c96ffebff543689b84c073d1b9 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -379,8 +379,8 @@ def handle_removed_packages(packages):
 def setup_additional_packages():
     """Enable additional software in persistence."""
     launch_persistence_setup("--no-gui",
-                             "--no-display-finished-message",
-                             "--force-enable-preset", "AdditionalSoftware")
+                             "--no-display_finished_message",
+                             "--force_enable_preset", "AdditionalSoftware")
 
 
 def create_persistence_and_setup_additional_packages(packages):
@@ -393,8 +393,8 @@ def create_persistence_and_setup_additional_packages(packages):
     """
     logging.info("Creating new persistent volume")
     launch_persistence_setup("--step", "bootstrap",
-                             "--no-display-finished-message",
-                             "--force-enable-preset", "AdditionalSoftware")
+                             "--no-display_finished_message",
+                             "--force_enable_preset", "AdditionalSoftware")
     add_additional_packages(packages, search_new_persistence=True)
     # show persistence configuration
     launch_persistence_setup()