diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json
index 5f085c7af7..2904e4256d 100644
--- a/modules/distribution/product/src/main/resources/conf/default.json
+++ b/modules/distribution/product/src/main/resources/conf/default.json
@@ -482,6 +482,7 @@
   "apim.jwt.use_kid_property": true,
   "apim.jwt.use_sha256_hash": false,
   "server_configuration": {
+    "diagnostic_tool_enabled": "true",
     "deployment_toml_path": "../conf/deployment.toml",
     "logs_directory": "../repository/logs",
     "updates_config_path": "../updates/config.json",
diff --git a/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2 b/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2
index 7703b49da1..7b36164982 100644
--- a/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2
+++ b/modules/distribution/product/src/main/resources/conf/templates/diagnostics-tool/conf/config.toml.j2
@@ -26,6 +26,7 @@
 
 # Server Configurations
 [server_configuration]
+diagnostic_tool_enabled = "{{server_configuration.diagnostic_tool_enabled}}"
 deployment_toml_path = "{{server_configuration.deployment_toml_path}}"
 logs_directory = "{{server_configuration.logs_directory}}"
 updates_config_path = "{{server_configuration.updates_config_path}}"
diff --git a/pom.xml b/pom.xml
index 643653cd39..88b5a3051c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1461,7 +1461,7 @@
         <config.mapper.version>1.0.24</config.mapper.version>
 
         <!-- Diagnostic Tool Dependencies -->
-        <diagnostics.tool.version>1.0.15</diagnostics.tool.version>
+        <diagnostics.tool.version>1.0.16</diagnostics.tool.version>
 
         <!-- Authenticator Properties -->
         <identity.outbound.auth.oidc.version>5.11.34</identity.outbound.auth.oidc.version>