diff --git a/src/data_types.hpp b/src/data_types.hpp
index cffbd99..b266a29 100644
--- a/src/data_types.hpp
+++ b/src/data_types.hpp
@@ -2,7 +2,7 @@
 
 #include "tupleref.hpp"
 
-#include <experimental/any>
+#include <any>
 #include <sdbusplus/message.hpp>
 #include <sdbusplus/utility/merge_variants.hpp>
 #include <string>
@@ -10,8 +10,6 @@
 #include <xyz/openbmc_project/Logging/Entry/server.hpp>
 #include <xyz/openbmc_project/Software/Version/server.hpp>
 
-namespace any_ns = std::experimental;
-
 namespace phosphor
 {
 namespace dbus
@@ -89,7 +87,7 @@
 // *INDENT-OFF*
 using PropertyIndex =
     TupleRefMap<TupleOfRefs<const std::string, const std::string,
-                            std::tuple<any_ns::any, any_ns::any>>,
+                            std::tuple<std::any, std::any>>,
                 const std::string, const std::string, const std::string>;
 // *INDENT-ON*