diff --git a/occ_command.cpp b/occ_command.cpp
index d8eec1c..1620156 100644
--- a/occ_command.cpp
+++ b/occ_command.cpp
@@ -19,11 +19,6 @@
 
 // #define TRACE_PACKETS
 
-std::ostream& operator<<(std::ostream& os, open_power::occ::SysPwrMode spm)
-{
-    return os << static_cast<int>(spm);
-}
-
 namespace open_power
 {
 namespace occ
diff --git a/occ_command.hpp b/occ_command.hpp
index 6f0c056..b3983ff 100644
--- a/occ_command.hpp
+++ b/occ_command.hpp
@@ -3,7 +3,7 @@
 #include "occ_errors.hpp"
 #include "utils.hpp"
 
-#include <fmt/ostream.h>
+#include <fmt/format.h>
 
 #include <org/open_power/OCC/PassThrough/server.hpp>
 #include <sdbusplus/bus.hpp>
@@ -57,6 +57,11 @@
     MAX_PERF = 0x0C      // Maximum Performance
 };
 
+static inline auto format_as(SysPwrMode spm)
+{
+    return fmt::underlying(spm);
+}
+
 // Only some of the SysPwrModes are currently supported and allowed to be set
 #define VALID_POWER_MODE_SETTING(mode)                                         \
     ((mode == SysPwrMode::STATIC) || (mode == SysPwrMode::POWER_SAVING) ||     \
@@ -85,6 +90,11 @@
     COMM_FAILURE = 0x03
 };
 
+static inline auto format_as(CmdStatus cs)
+{
+    return fmt::underlying(cs);
+}
+
 /** @brief Trace block of data in hex with log<level:INFO>
  *
  *  @param[in] data - vector containing data to trace
@@ -173,7 +183,3 @@
 
 } // namespace occ
 } // namespace open_power
-
-template <>
-struct fmt::formatter<open_power::occ::SysPwrMode> : ostream_formatter
-{};