diff --git a/src/pmdas/hdb/hdb.conf b/src/pmdas/hdb/hdb.conf
index 2e7eff46cc7..6fd2e8befa3 100644
--- a/src/pmdas/hdb/hdb.conf
+++ b/src/pmdas/hdb/hdb.conf
@@ -3,6 +3,8 @@
 #
 
 [hdb]
+# Connection settings must be configured before use
+
 # IP address or DNS name of the SAP HANA service
 #host=localhost
 
@@ -10,10 +12,10 @@
 #port=39017
 
 # SAP HANA user used for authentication
-user=user
+#user=CHANGE_ME
 
 # Password of the SAP HANA user
-password=password
+#password=CHANGE_ME
 
 # Connection timeout in miliSeconds
 #connect_timeout=60000
diff --git a/src/pmdas/mssql/mssql.conf b/src/pmdas/mssql/mssql.conf
index ccc9a508009..d6fab19570b 100644
--- a/src/pmdas/mssql/mssql.conf
+++ b/src/pmdas/mssql/mssql.conf
@@ -8,8 +8,9 @@ timeout=2
 #https://docs.microsoft.com/en-us/sql/relational-databases/security/choose-an-authentication-mode
 
 # Option 1: Mixed mode authentication
-username=sa
-password=P4$$W0rd
+# username and password must be configured before use
+#username=CHANGE_ME
+#password=CHANGE_ME
 
 # Option 2: Windows authentication
 #trusted=true
diff --git a/src/pmdas/oracle/sample.conf b/src/pmdas/oracle/sample.conf
index 8e3a64566a6..707939adf1e 100644
--- a/src/pmdas/oracle/sample.conf
+++ b/src/pmdas/oracle/sample.conf
@@ -1,5 +1,6 @@
-$username = 'oastoltp';
-$password = 'oastoltp';
+# username and password must be configured before use
+#$username = 'CHANGE_ME';
+#$password = 'CHANGE_ME';
 @sids = ( 'oast1' );
 $disable_object_cache = 1;
 
diff --git a/src/pmdas/postgresql/pmdapostgresql.conf b/src/pmdas/postgresql/pmdapostgresql.conf
index 596dad62a62..b7b1d2e3a14 100644
--- a/src/pmdas/postgresql/pmdapostgresql.conf
+++ b/src/pmdas/postgresql/pmdapostgresql.conf
@@ -1,7 +1,8 @@
 [authentication]
-host=local
-port=5432
-dbname=postgres
-user=postgres
-password=password
-osuser=postgres
+# Connection settings must be configured before use
+#host=local
+#port=5432
+#dbname=postgres
+#user=CHANGE_ME
+#password=CHANGE_ME
+#osuser=postgres
diff --git a/src/pmdas/rabbitmq/rabbitmq.conf b/src/pmdas/rabbitmq/rabbitmq.conf
index 3f68257788d..e57c99d196e 100644
--- a/src/pmdas/rabbitmq/rabbitmq.conf
+++ b/src/pmdas/rabbitmq/rabbitmq.conf
@@ -1,5 +1,6 @@
 # Rabbitmq configuration
 [pmda]
-username = guest
-password = guest
+# username and password must be configured before use
+#username = CHANGE_ME
+#password = CHANGE_ME
 port = 15672
\ No newline at end of file