diff --git a/drivers/SmartThings/jbl/src/log.lua b/drivers/SmartThings/jbl/src/log.lua
new file mode 100644
index 0000000000..f4a8c1509c
--- /dev/null
+++ b/drivers/SmartThings/jbl/src/log.lua
@@ -0,0 +1,54 @@
+-- Copyright 2021 SmartThings
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+local original_log
+if _envlibrequire ~= nil then
+  original_log = _envlibrequire("log")
+else
+  original_log = require("stdout_log")
+end
+
+local hubcore_enabled_log
+
+hubcore_enabled_log.info = function(...)
+  original_log.info_with({hub_logs = true}, ...)
+end
+
+hubcore_enabled_log.warn = function(...)
+  original_log.warn_with({hub_logs = true}, ...)
+end
+
+hubcore_enabled_log.error = function(...)
+  original_log.error_with({hub_logs = true}, ...)
+end
+
+--- Force logging Debug at Info to avoid needing to increase verbosity in hubcore for
+--- diagnostic purposes
+hubcore_enabled_log.debug = function(...)
+  hubcore_enabled_log.info(table.concat({"[DEBUG->INFO] ", ...}))
+end
+
+--- Force logging Trace at Info to avoid needing to increase verbosity in hubcore for
+--- diagnostic purposes
+hubcore_enabled_log.trace = function(...)
+  hubcore_enabled_log.info(table.concat({"[TRACE->INFO] ", ...}))
+end
+
+hubcore_enabled_log.info_with = original_log.info_with
+hubcore_enabled_log.warn_with = original_log.warn_with
+hubcore_enabled_log.error_with = original_log.error_with
+hubcore_enabled_log.debug_with = original_log.debug_with
+hubcore_enabled_log.trace_with = original_log.trace_with
+
+return hubcore_enabled_log