diff --git a/centos-7/configs/cloud/cloud.cfg b/centos-7/configs/cloud/cloud.cfg
index dd84aa2..e985cbf 100644
--- a/centos-7/configs/cloud/cloud.cfg
+++ b/centos-7/configs/cloud/cloud.cfg
@@ -49,6 +49,7 @@
  - phone-home
  - final-message
 
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -56,6 +57,9 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
 
 growpart:
    mode: auto
diff --git a/debian-8/configs/cloud/cloud.cfg b/debian-8/configs/cloud/cloud.cfg
index 93f6357..a80ebbc 100644
--- a/debian-8/configs/cloud/cloud.cfg
+++ b/debian-8/configs/cloud/cloud.cfg
@@ -62,6 +62,7 @@
  - final-message
  - power-state-change
 
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -69,4 +70,7 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
 
diff --git a/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg b/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
index dd58838..dcce367 100644
--- a/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -1,3 +1,4 @@
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -5,6 +6,9 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
 
 growpart:
    mode: auto
diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg
index 93f6357..c3cbb03 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg
@@ -62,6 +62,7 @@
  - final-message
  - power-state-change
 
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -69,4 +70,6 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
-
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
diff --git a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index a2276ac..2f1b85c 100644
--- a/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-14.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -1,3 +1,4 @@
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -5,6 +6,9 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
 
 system_info:
    # This will affect which distro class gets used
diff --git a/ubuntu-16.04/configs/cloud/cloud.cfg b/ubuntu-16.04/configs/cloud/cloud.cfg
index 93f6357..c3cbb03 100644
--- a/ubuntu-16.04/configs/cloud/cloud.cfg
+++ b/ubuntu-16.04/configs/cloud/cloud.cfg
@@ -62,6 +62,7 @@
  - final-message
  - power-state-change
 
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -69,4 +70,6 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
-
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
diff --git a/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index a2276ac..2f1b85c 100644
--- a/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -1,3 +1,4 @@
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
 datasource:
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
@@ -5,6 +6,9 @@
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+    MAAS:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
 
 system_info:
    # This will affect which distro class gets used