diff --git a/subiquity/controllers/filesystem.py b/subiquity/controllers/filesystem.py
index ec03274c..501fbc55 100644
--- a/subiquity/controllers/filesystem.py
+++ b/subiquity/controllers/filesystem.py
@@ -154,6 +154,10 @@ class FilesystemController(SubiquityController):
                 disks = self.model.all_disks()
                 disks.sort(key=lambda x: x.size)
                 meth(disks[-1])
+        elif 'config' in self.ai_data:
+            with self.context.child("applying_autoinstall"):
+                # needs to account for grub and swap data too.
+                self.model.apply_autoinstall_config(self.ai_data['config'])
 
     def start(self):
         self._start_task = schedule_task(self._start())
diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py
index ff4ef2c9..48f13181 100644
--- a/subiquity/models/filesystem.py
+++ b/subiquity/models/filesystem.py
@@ -1257,6 +1257,10 @@ class FilesystemModel(object):
             self._actions = []
         self.grub_install_device = None
 
+    def apply_autoinstall_config(self, ai_config):
+        self._actions = self._actions_from_config(
+            ai_config, self._probe_data['blockdev'])
+
     def _actions_from_config(self, config, blockdevs):
         """Convert curtin storage config into action instances.