diff --git a/drydock_provisioner/drivers/node/maasdriver/driver.py b/drydock_provisioner/drivers/node/maasdriver/driver.py
index 0c0815bd..4294adeb 100644
--- a/drydock_provisioner/drivers/node/maasdriver/driver.py
+++ b/drydock_provisioner/drivers/node/maasdriver/driver.py
@@ -1136,7 +1136,15 @@ class MaasTaskRunner(drivers.DriverTaskRunner):
                     self.logger.warning("Error acquiring node %s, skipping" % n)
                     failed = True
                     continue
-                    
+
+                # Need to create bootdata keys for all the nodes being deployed
+                # TODO this should be in the orchestrator
+                node = site_design.get_baremetal_node(n)
+                data_key = str(uuid.uuid4())
+                self.state_manager.set_bootdata_key(n, self.task.design_id, data_key)
+                node.owner_data['bootdata_key'] = data_key
+                self.logger.debug("Configured bootdata for node %s" % (n))
+
                 # Set owner data in MaaS
                 try:
                     self.logger.info("Setting node %s owner data." % n)