diff --git a/src/tensorflow.cc b/src/tensorflow.cc
index b512996..77db41c 100644
--- a/src/tensorflow.cc
+++ b/src/tensorflow.cc
@@ -1828,11 +1828,8 @@ TRITONSERVER_Error*
 ModelState::ValidateModelConfig()
 {
   // We have the json DOM for the model configuration...
-  triton::common::TritonJson::WriteBuffer buffer;
-  RETURN_IF_ERROR(ModelConfig().PrettyWrite(&buffer));
-  LOG_MESSAGE(
-      TRITONSERVER_LOG_VERBOSE,
-      (std::string("model configuration:\n") + buffer.Contents()).c_str());
+  LOG_JSON_VALUE(
+      TRITONSERVER_LOG_VERBOSE, "model_configuration", ModelConfig());
 
   triton::common::TritonJson::Value ios;
   RETURN_IF_ERROR(ModelConfig().MemberAsArray("input", &ios));
@@ -2610,13 +2607,14 @@ TRITONBACKEND_Initialize(TRITONBACKEND_Backend* backend)
   RETURN_IF_ERROR(
       TRITONBACKEND_BackendConfig(backend, &backend_config_message));
 
+  LOG_SERVER_MESSAGE(
+      TRITONSERVER_LOG_INFO, "backend configuration", backend_config_message);
+
   const char* buffer;
   size_t byte_size;
+
   RETURN_IF_ERROR(TRITONSERVER_MessageSerializeToJson(
       backend_config_message, &buffer, &byte_size));
-  LOG_MESSAGE(
-      TRITONSERVER_LOG_INFO,
-      (std::string("backend configuration:\n") + buffer).c_str());
 
   triton::common::TritonJson::Value backend_config;
   if (byte_size != 0) {