diff --git a/include/forward_unauthorized.hpp b/include/forward_unauthorized.hpp
index ddf3e3b..a48b775 100644
--- a/include/forward_unauthorized.hpp
+++ b/include/forward_unauthorized.hpp
@@ -20,7 +20,7 @@
         if (hasWebuiRoute)
         {
             res.result(boost::beast::http::status::temporary_redirect);
-            res.addHeader("Location",
+            res.addHeader(boost::beast::http::field::location,
                           "/#/login?next=" + http_helpers::urlEncode(url));
             return;
         }
@@ -46,6 +46,6 @@
     {
         return;
     }
-    res.addHeader("WWW-Authenticate", "Basic");
+    res.addHeader(boost::beast::http::field::www_authenticate, "Basic");
 }
 } // namespace forward_unauthorized
diff --git a/include/ibm/management_console_rest.hpp b/include/ibm/management_console_rest.hpp
index 0d8e287..7396ce6 100644
--- a/include/ibm/management_console_rest.hpp
+++ b/include/ibm/management_console_rest.hpp
@@ -321,7 +321,8 @@
 
     std::string contentDispositionParam =
         "attachment; filename=\"" + fileID + "\"";
-    asyncResp->res.addHeader("Content-Disposition", contentDispositionParam);
+    asyncResp->res.addHeader(boost::beast::http::field::content_disposition,
+                             contentDispositionParam);
     std::string fileData;
     fileData = {std::istreambuf_iterator<char>(readfile),
                 std::istreambuf_iterator<char>()};
diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp
index 9c8d9f5..f458fac 100644
--- a/include/openbmc_dbus_rest.hpp
+++ b/include/openbmc_dbus_rest.hpp
@@ -2547,7 +2547,7 @@
                 continue;
             }
 
-            asyncResp->res.addHeader("Content-Type",
+            asyncResp->res.addHeader(boost::beast::http::field::content_type,
                                      "application/octet-stream");
 
             // Assuming only one dump file will be present in the dump
@@ -2567,8 +2567,9 @@
             std::string contentDispositionParam =
                 "attachment; filename=\"" + dumpFileName + "\"";
 
-            asyncResp->res.addHeader("Content-Disposition",
-                                     contentDispositionParam);
+            asyncResp->res.addHeader(
+                boost::beast::http::field::content_disposition,
+                contentDispositionParam);
 
             asyncResp->res.body() = {std::istreambuf_iterator<char>(readFile),
                                      std::istreambuf_iterator<char>()};
diff --git a/include/webassets.hpp b/include/webassets.hpp
index 3d25296..cd57eb3 100644
--- a/include/webassets.hpp
+++ b/include/webassets.hpp
@@ -152,13 +152,15 @@
                     const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) {
                 if (contentType != nullptr)
                 {
-                    asyncResp->res.addHeader("Content-Type", contentType);
+                    asyncResp->res.addHeader(
+                        boost::beast::http::field::content_type, contentType);
                 }
 
                 if (contentEncoding != nullptr)
                 {
-                    asyncResp->res.addHeader("Content-Encoding",
-                                             contentEncoding);
+                    asyncResp->res.addHeader(
+                        boost::beast::http::field::content_encoding,
+                        contentEncoding);
                 }
 
                 // res.set_header("Cache-Control", "public, max-age=86400");
