diff --git a/internal/metrics/mapping.go b/internal/metrics/mapping.go
index 8c6ff8a..742194f 100644
--- a/internal/metrics/mapping.go
+++ b/internal/metrics/mapping.go
@@ -66,10 +66,10 @@ func generateMetricNamesMap() map[string]metricLookup {
 		"STATMQI/SUBSCRIBE/Subscription delete failure count":                     metricLookup{"failed_subscription_delete_total", true},
 		"STATMQI/SUBSCRIBE/MQSUBRQ count":                                         metricLookup{"mqsubrq_total", true},
 		"STATMQI/SUBSCRIBE/Failed MQSUBRQ count":                                  metricLookup{"failed_mqsubrq_total", true},
-		"STATMQI/SUBSCRIBE/Durable subscriber - high water mark":                  metricLookup{"durable_subscriber_high_water_mark", true},
-		"STATMQI/SUBSCRIBE/Durable subscriber - low water mark":                   metricLookup{"durable_subscriber_low_water_mark", true},
-		"STATMQI/SUBSCRIBE/Non-durable subscriber - high water mark":              metricLookup{"non_durable_subscriber_high_water_mark", true},
-		"STATMQI/SUBSCRIBE/Non-durable subscriber - low water mark":               metricLookup{"non_durable_subscriber_low_water_mark", true},
+		"STATMQI/SUBSCRIBE/Durable subscriber - high water mark":                  metricLookup{"durable_subscriber_high_water_mark", false},
+		"STATMQI/SUBSCRIBE/Durable subscriber - low water mark":                   metricLookup{"durable_subscriber_low_water_mark", false},
+		"STATMQI/SUBSCRIBE/Non-durable subscriber - high water mark":              metricLookup{"non_durable_subscriber_high_water_mark", false},
+		"STATMQI/SUBSCRIBE/Non-durable subscriber - low water mark":               metricLookup{"non_durable_subscriber_low_water_mark", false},
 		"STATMQI/PUBLISH/Topic MQPUT/MQPUT1 interval total":                       metricLookup{"topic_mqput_mqput1_total", true},
 		"STATMQI/PUBLISH/Interval total topic bytes put":                          metricLookup{"topic_put_bytes_total", true},
 		"STATMQI/PUBLISH/Failed topic MQPUT/MQPUT1 count":                         metricLookup{"failed_topic_mqput_mqput1_total", true},
@@ -80,7 +80,7 @@ func generateMetricNamesMap() map[string]metricLookup {
 		"STATMQI/CONNDISC/MQCONN/MQCONNX count":                                   metricLookup{"mqconn_mqconnx_total", true},
 		"STATMQI/CONNDISC/Failed MQCONN/MQCONNX count":                            metricLookup{"failed_mqconn_mqconnx_total", true},
 		"STATMQI/CONNDISC/MQDISC count":                                           metricLookup{"mqdisc_total", true},
-		"STATMQI/CONNDISC/Concurrent connections - high water mark":               metricLookup{"concurrent_connections_high_water_mark", true},
+		"STATMQI/CONNDISC/Concurrent connections - high water mark":               metricLookup{"concurrent_connections_high_water_mark", false},
 		"STATMQI/OPENCLOSE/MQOPEN count":                                          metricLookup{"mqopen_total", true},
 		"STATMQI/OPENCLOSE/Failed MQOPEN count":                                   metricLookup{"failed_mqopen_total", true},
 		"STATMQI/OPENCLOSE/MQCLOSE count":                                         metricLookup{"mqclose_total", true},
diff --git a/test/docker/mqmetric_test_util.go b/test/docker/mqmetric_test_util.go
index ab10ff0..2f52131 100644
--- a/test/docker/mqmetric_test_util.go
+++ b/test/docker/mqmetric_test_util.go
@@ -201,10 +201,10 @@ func metricNames() []string {
 		"failed_subscription_delete_total",
 		"mqsubrq_total",
 		"failed_mqsubrq_total",
-		"durable_subscriber_high_water_mark",
-		"durable_subscriber_low_water_mark",
-		"non_durable_subscriber_high_water_mark",
-		"non_durable_subscriber_low_water_mark",
+		// disabled : "durable_subscriber_high_water_mark",
+		// disabled : "durable_subscriber_low_water_mark",
+		// disabled : "non_durable_subscriber_high_water_mark",
+		// disabled : "non_durable_subscriber_low_water_mark",
 		"topic_mqput_mqput1_total",
 		"topic_put_bytes_total",
 		"failed_topic_mqput_mqput1_total",
@@ -215,7 +215,7 @@ func metricNames() []string {
 		"mqconn_mqconnx_total",
 		"failed_mqconn_mqconnx_total",
 		"mqdisc_total",
-		"concurrent_connections_high_water_mark",
+		// disabled : "concurrent_connections_high_water_mark",
 		"mqopen_total",
 		"failed_mqopen_total",
 		"mqclose_total",