diff --git a/config/coreos/waagent.conf b/config/coreos/waagent.conf
index 5af0baf..6535578 100644
--- a/config/coreos/waagent.conf
+++ b/config/coreos/waagent.conf
@@ -89,3 +89,6 @@ OS.OpensslPath=None
 
 #
 # Home.Dir=/home
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y
diff --git a/config/freebsd/waagent.conf b/config/freebsd/waagent.conf
index 441bcc7..416dcbb 100644
--- a/config/freebsd/waagent.conf
+++ b/config/freebsd/waagent.conf
@@ -90,3 +90,6 @@ OS.SudoersDir=/usr/local/etc/sudoers.d
 
 #
 # Home.Dir=/home
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y
diff --git a/config/suse/waagent.conf b/config/suse/waagent.conf
index 7cd6d37..2fc42a1 100644
--- a/config/suse/waagent.conf
+++ b/config/suse/waagent.conf
@@ -77,3 +77,6 @@ OS.OpensslPath=None
 
 # Detect Scvmm environment, default is n
 # DetectScvmmEnv=n
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf
index ee60045..1bde317 100644
--- a/config/ubuntu/waagent.conf
+++ b/config/ubuntu/waagent.conf
@@ -77,3 +77,6 @@ OS.OpensslPath=None
 
 # Detect Scvmm environment, default is n
 # DetectScvmmEnv=n
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y
diff --git a/config/waagent.conf b/config/waagent.conf
index e808117..d183d2f 100644
--- a/config/waagent.conf
+++ b/config/waagent.conf
@@ -89,3 +89,6 @@ OS.OpensslPath=None
 
 #
 # Home.Dir=/home
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y
diff --git a/snappy/waagent.conf b/snappy/waagent.conf
index 74dccb8..3862cad 100644
--- a/snappy/waagent.conf
+++ b/snappy/waagent.conf
@@ -68,3 +68,6 @@ OS.OpensslPath=None
 
 # Detect Scvmm environment, default is n
 # DetectScvmmEnv=n
+
+# Enable RDMA management and set up, should only be used in HPC images
+# OS.EnableRDMA=y