diff --git a/include/hostname_monitor.hpp b/include/hostname_monitor.hpp
index 6339a6b..188deff 100644
--- a/include/hostname_monitor.hpp
+++ b/include/hostname_monitor.hpp
@@ -28,7 +28,12 @@
 
         BMCWEB_LOG_INFO("Replace HTTPs Certificate Success, "
                         "remove temporary certificate file..");
-        remove(certPath.c_str());
+        std::error_code ec2;
+        std::filesystem::remove(certPath.c_str(), ec2);
+        if (ec2)
+        {
+            BMCWEB_LOG_ERROR("Failed to remove certificate");
+        }
     },
         "xyz.openbmc_project.Certs.Manager.Server.Https",
         "/xyz/openbmc_project/certs/server/https/1",
diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
index 838e7a1..9607ddf 100644
--- a/include/nbd_proxy.hpp
+++ b/include/nbd_proxy.hpp
@@ -63,8 +63,13 @@
         boost::system::error_code ec;
         peerSocket.close(ec);
 
-        BMCWEB_LOG_DEBUG("std::remove({})", socketId);
-        std::remove(socketId.c_str());
+        BMCWEB_LOG_DEBUG("std::filesystem::remove({})", socketId);
+        std::error_code ec2;
+        std::filesystem::remove(socketId.c_str(), ec2);
+        if (ec2)
+        {
+            BMCWEB_LOG_DEBUG("Failed to remove file, ignoring");
+        }
 
         crow::connections::systemBus->async_method_call(
             dbus::utility::logError, "xyz.openbmc_project.VirtualMedia", path,