--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -2,6 +2,11 @@
 # Windows Azure Linux Agent Configuration
 #
 
+# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will
+# unless you disable Cloud-init disk provisioning. Please see
+# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf
+#
+
 # Specified program is invoked with the argument "Ready" when we report ready status
 # to the endpoint server.
 Role.StateConsumer=None
@@ -14,19 +19,19 @@
 Role.TopologyConsumer=None
 
 # Enable instance creation
-Provisioning.Enabled=y
+Provisioning.Enabled=n
 
 # Password authentication for root account will be unavailable.
-Provisioning.DeleteRootPassword=y
+Provisioning.DeleteRootPassword=n
 
 # Generate fresh host key pair.
-Provisioning.RegenerateSshHostKeyPair=y
+Provisioning.RegenerateSshHostKeyPair=n
 
 # Supported values are "rsa", "dsa" and "ecdsa".
 Provisioning.SshHostKeyPairType=rsa
 
 # Monitor host name changes and publish changes via DHCP requests.
-Provisioning.MonitorHostName=y
+Provisioning.MonitorHostName=n
 
 # Decode CustomData from Base64.
 Provisioning.DecodeCustomData=n
@@ -35,14 +40,14 @@
 Provisioning.ExecuteCustomData=n
 
 # Format if unformatted. If 'n', resource disk will not be mounted.
-ResourceDisk.Format=y
+ResourceDisk.Format=n
 
 # File system on the resource disk
 # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
 ResourceDisk.Filesystem=ext4
 
 # Mount point for the resource disk
-ResourceDisk.MountPoint=/mnt/resource
+ResourceDisk.MountPoint=/mnt
 
 # Create and use swapfile on resource disk.
 ResourceDisk.EnableSwap=n