diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
index 6535578..d8183d6 100644
--- a/config/coreos/waagent.conf
+++ b/config/coreos/waagent.conf
@@ -92,3 +92,7 @@ OS.OpensslPath=None
 
 # Enable RDMA management and set up, should only be used in HPC images
 # OS.EnableRDMA=y
+
+# Enable or disable self-update, default is enabled
+AutoUpdate.Enabled=y
+AutoUpdate.GAFamily=Prod
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
index 416dcbb..907b219 100644
--- a/config/freebsd/waagent.conf
+++ b/config/freebsd/waagent.conf
@@ -93,3 +93,7 @@ OS.SudoersDir=/usr/local/etc/sudoers.d
 
 # Enable RDMA management and set up, should only be used in HPC images
 # OS.EnableRDMA=y
+
+# Enable or disable self-update, default is enabled
+AutoUpdate.Enabled=y
+AutoUpdate.GAFamily=Prod
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
index 2fc42a1..8ea3195 100644
--- a/config/suse/waagent.conf
+++ b/config/suse/waagent.conf
@@ -80,3 +80,7 @@ OS.OpensslPath=None
 
 # Enable RDMA management and set up, should only be used in HPC images
 # OS.EnableRDMA=y
+
+# Enable or disable self-update, default is enabled
+AutoUpdate.Enabled=y
+AutoUpdate.GAFamily=Prod
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
index 1bde317..ca68044 100644
--- a/config/ubuntu/waagent.conf
+++ b/config/ubuntu/waagent.conf
@@ -80,3 +80,7 @@ OS.OpensslPath=None
 
 # Enable RDMA management and set up, should only be used in HPC images
 # OS.EnableRDMA=y
+
+# Enable or disable self-update, default is enabled
+AutoUpdate.Enabled=y
+AutoUpdate.GAFamily=Prod
diff --git a/config/waagent.conf b/config/waagent.conf
index d183d2f..c28a651 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -92,3 +92,7 @@ OS.OpensslPath=None
 
 # Enable RDMA management and set up, should only be used in HPC images
 # OS.EnableRDMA=y
+
+# Enable or disable self-update, default is enabled
+AutoUpdate.Enabled=y
+AutoUpdate.GAFamily=Prod