diff --git a/config/alpine/waagent.conf b/config/alpine/waagent.conf
index ac9466e11f..2a010cfd7b 100644
--- a/config/alpine/waagent.conf
+++ b/config/alpine/waagent.conf
@@ -2,15 +2,13 @@
 # Windows Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/arch/waagent.conf b/config/arch/waagent.conf
index 8d509cf6bf..f9993594fe 100644
--- a/config/arch/waagent.conf
+++ b/config/arch/waagent.conf
@@ -2,11 +2,9 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=n
diff --git a/config/bigip/waagent.conf b/config/bigip/waagent.conf
index 7446bcb9cd..49acf9dbd5 100644
--- a/config/bigip/waagent.conf
+++ b/config/bigip/waagent.conf
@@ -13,15 +13,13 @@ Role.ConfigurationConsumer=None
 # Specified program is invoked with XML file argument specifying role topology.
 Role.TopologyConsumer=None
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/clearlinux/waagent.conf b/config/clearlinux/waagent.conf
index 10567cc9d2..0b70d2621c 100644
--- a/config/clearlinux/waagent.conf
+++ b/config/clearlinux/waagent.conf
@@ -13,11 +13,9 @@ Role.ConfigurationConsumer=None
 # Specified program is invoked with XML file argument specifying role topology.
 Role.TopologyConsumer=None
 
-# Enable instance creation
-Provisioning.Enabled=y
-
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
index 8d3312c2eb..0ce7b27a03 100644
--- a/config/coreos/waagent.conf
+++ b/config/coreos/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=n
diff --git a/config/debian/waagent.conf b/config/debian/waagent.conf
index 28e496ebd1..4c1880ec47 100644
--- a/config/debian/waagent.conf
+++ b/config/debian/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
index 9c72ea27f9..e2a1255771 100644
--- a/config/freebsd/waagent.conf
+++ b/config/freebsd/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/gaia/waagent.conf b/config/gaia/waagent.conf
index 6992ff294d..b1dc764b65 100644
--- a/config/gaia/waagent.conf
+++ b/config/gaia/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=n
diff --git a/config/iosxe/waagent.conf b/config/iosxe/waagent.conf
index 6787d30e99..533a234b3e 100644
--- a/config/iosxe/waagent.conf
+++ b/config/iosxe/waagent.conf
@@ -2,11 +2,9 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=n
-
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/nsbsd/waagent.conf b/config/nsbsd/waagent.conf
index 178f9a22e5..b859fd5db8 100644
--- a/config/nsbsd/waagent.conf
+++ b/config/nsbsd/waagent.conf
@@ -2,11 +2,9 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=n
diff --git a/config/openbsd/waagent.conf b/config/openbsd/waagent.conf
index 54f2e118be..697f129dd8 100644
--- a/config/openbsd/waagent.conf
+++ b/config/openbsd/waagent.conf
@@ -2,11 +2,9 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
index 5e601e651a..dc99b128b6 100644
--- a/config/suse/waagent.conf
+++ b/config/suse/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
index 759db7071d..8c2c512549 100644
--- a/config/ubuntu/waagent.conf
+++ b/config/ubuntu/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=n
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=y
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y
diff --git a/config/waagent.conf b/config/waagent.conf
index 62a9441fd4..b558bb46d7 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -2,15 +2,13 @@
 # Microsoft Azure Linux Agent Configuration
 #
 
-# Enable instance creation
-Provisioning.Enabled=y
-
 # Enable extension handling. Do not disable this unless you do not need password reset,
 # backup, monitoring, or any extension handling whatsoever.
 Extensions.Enabled=y
 
-# Rely on cloud-init to provision
-Provisioning.UseCloudInit=n
+# Which provisioning agent to use. Supported values are "auto" (default), "waagent",
+# "cloud-init", or "disabled".
+Provisioning.Agent=auto
 
 # Password authentication for root account will be unavailable.
 Provisioning.DeleteRootPassword=y