diff --git a/ubuntu-18.04/files/etc/cloud/cloud.cfg.d/99_mcp.cfg b/ubuntu-18.04/files/etc/cloud/cloud.cfg.d/99_mcp.cfg
new file mode 100644
index 0000000..0ff3b57
--- /dev/null
+++ b/ubuntu-18.04/files/etc/cloud/cloud.cfg.d/99_mcp.cfg
@@ -0,0 +1,24 @@
+datasource_list: [ NoCloud, ConfigDrive, Ec2, OpenStack, OVF, MAAS, None ]
+datasource:
+    Ec2:
+      timeout: 5 # (defaults to 50 seconds)
+      max_wait: 10 # (defaults to 120 seconds)
+      strict_id: false
+    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)
+
+warnings:
+   dsid_missing_source: off
+
+system_info:
+   # This will affect which distro class gets used
+   distro: ubuntu
+   ssh_svcname: ssh
+
+growpart:
+   mode: auto
+   devices: ['/']
diff --git a/ubuntu-18.04/files/etc/iscsi/initiatorname.iscsi b/ubuntu-18.04/files/etc/iscsi/initiatorname.iscsi
new file mode 100644
index 0000000..bc15b98
--- /dev/null
+++ b/ubuntu-18.04/files/etc/iscsi/initiatorname.iscsi
@@ -0,0 +1,6 @@
+## DO NOT EDIT OR REMOVE THIS FILE!
+## If you remove this file, the iSCSI daemon will not start.
+## If you change the InitiatorName, existing access control lists
+## may reject this initiator.  The InitiatorName must be unique
+## for each iSCSI initiator.  Do NOT duplicate iSCSI InitiatorNames.
+GenerateName=yes
\ No newline at end of file