diff --git a/cmake/RippledSettings.cmake b/cmake/RippledSettings.cmake
index 9f59d9e9eb..9dc8609f58 100644
--- a/cmake/RippledSettings.cmake
+++ b/cmake/RippledSettings.cmake
@@ -118,7 +118,7 @@ option(beast_no_unit_test_inline
   "Prevents unit test definitions from being inserted into global table"
   OFF)
 option(single_io_service_thread
-  "Restricts the number of threads calling io_context::run to one. \
+  "Restricts the number of threads calling io_service::run to one. \
   This can be useful when debugging."
   OFF)
 option(boost_show_deprecated
diff --git a/cmake/deps/Boost.cmake b/cmake/deps/Boost.cmake
index e431e57b0c..785820a072 100644
--- a/cmake/deps/Boost.cmake
+++ b/cmake/deps/Boost.cmake
@@ -24,7 +24,6 @@ target_link_libraries(ripple_boost
     Boost::date_time
     Boost::filesystem
     Boost::json
-    Boost::process
     Boost::program_options
     Boost::regex
     Boost::system
diff --git a/conan.lock b/conan.lock
index ec790e16ce..ebdc9ad9a8 100644
--- a/conan.lock
+++ b/conan.lock
@@ -21,7 +21,7 @@
         "date/3.0.4#f74bbba5a08fa388256688743136cb6f%1756234217.493",
         "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1756234217.915",
         "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1756234261.716",
-        "boost/1.88.0#8852c0b72ce8271fb8ff7c53456d4983%1756223752.326",
+        "boost/1.83.0#5d975011d65b51abb2d2f6eb8386b368%1754325043.336",
         "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1756234220.907"
     ],
     "build_requires": [
@@ -46,7 +46,7 @@
             "lz4/1.10.0"
         ],
         "boost/1.83.0": [
-            "boost/1.88.0"
+            "boost/1.83.0"
         ],
         "sqlite3/3.44.2": [
             "sqlite3/3.49.1"
diff --git a/conan/profiles/default b/conan/profiles/default
index 3a7bcda1c6..0417704f8a 100644
--- a/conan/profiles/default
+++ b/conan/profiles/default
@@ -26,6 +26,9 @@ tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 {% if compiler == "apple-clang" and compiler_version >= 17 %}
 tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 {% endif %}
+{% if compiler == "clang" and compiler_version == 16 %}
+tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
+{% endif %}
 {% if compiler == "gcc" and compiler_version < 13 %}
 tools.build:cxxflags=['-Wno-restrict']
 {% endif %}
diff --git a/conanfile.py b/conanfile.py
index 3146b887e0..bff4c93aa3 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -100,13 +100,11 @@ class Xrpl(ConanFile):
     def configure(self):
         if self.settings.compiler == 'apple-clang':
             self.options['boost'].visibility = 'global'
-        if self.settings.compiler in ['clang', 'gcc']:
-            self.options['boost'].without_cobalt = True
 
     def requirements(self):
         # Conan 2 requires transitive headers to be specified
         transitive_headers_opt = {'transitive_headers': True} if conan_version.split('.')[0] == '2' else {}
-        self.requires('boost/1.88.0', force=True, **transitive_headers_opt)
+        self.requires('boost/1.83.0', force=True, **transitive_headers_opt)
         self.requires('date/3.0.4', **transitive_headers_opt)
         self.requires('lz4/1.10.0', force=True)
         self.requires('protobuf/3.21.12', force=True)
@@ -177,7 +175,6 @@ class Xrpl(ConanFile):
             'boost::filesystem',
             'boost::json',
             'boost::program_options',
-            'boost::process',
             'boost::regex',
             'boost::system',
             'boost::thread',
diff --git a/include/xrpl/basics/ResolverAsio.h b/include/xrpl/basics/ResolverAsio.h
index 94688de650..49700d2b24 100644
--- a/include/xrpl/basics/ResolverAsio.h
+++ b/include/xrpl/basics/ResolverAsio.h
@@ -23,7 +23,7 @@
 #include <xrpl/basics/Resolver.h>
 #include <xrpl/beast/utility/Journal.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 namespace ripple {
 
@@ -33,7 +33,7 @@ public:
     explicit ResolverAsio() = default;
 
     static std::unique_ptr<ResolverAsio>
-    New(boost::asio::io_context&, beast::Journal);
+    New(boost::asio::io_service&, beast::Journal);
 };
 
 }  // namespace ripple
diff --git a/include/xrpl/beast/asio/io_latency_probe.h b/include/xrpl/beast/asio/io_latency_probe.h
index 37f75cf649..966b4686ae 100644
--- a/include/xrpl/beast/asio/io_latency_probe.h
+++ b/include/xrpl/beast/asio/io_latency_probe.h
@@ -23,8 +23,7 @@
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/post.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <chrono>
 #include <condition_variable>
@@ -33,7 +32,7 @@
 
 namespace beast {
 
-/** Measures handler latency on an io_context queue. */
+/** Measures handler latency on an io_service queue. */
 template <class Clock>
 class io_latency_probe
 {
@@ -45,12 +44,12 @@ private:
     std::condition_variable_any m_cond;
     std::size_t m_count;
     duration const m_period;
-    boost::asio::io_context& m_ios;
+    boost::asio::io_service& m_ios;
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> m_timer;
     bool m_cancel;
 
 public:
-    io_latency_probe(duration const& period, boost::asio::io_context& ios)
+    io_latency_probe(duration const& period, boost::asio::io_service& ios)
         : m_count(1)
         , m_period(period)
         , m_ios(ios)
@@ -65,16 +64,16 @@ public:
         cancel(lock, true);
     }
 
-    /** Return the io_context associated with the latency probe. */
+    /** Return the io_service associated with the latency probe. */
     /** @{ */
-    boost::asio::io_context&
-    get_io_context()
+    boost::asio::io_service&
+    get_io_service()
     {
         return m_ios;
     }
 
-    boost::asio::io_context const&
-    get_io_context() const
+    boost::asio::io_service const&
+    get_io_service() const
     {
         return m_ios;
     }
@@ -110,10 +109,8 @@ public:
         std::lock_guard lock(m_mutex);
         if (m_cancel)
             throw std::logic_error("io_latency_probe is canceled");
-        boost::asio::post(
-            m_ios,
-            sample_op<Handler>(
-                std::forward<Handler>(handler), Clock::now(), false, this));
+        m_ios.post(sample_op<Handler>(
+            std::forward<Handler>(handler), Clock::now(), false, this));
     }
 
     /** Initiate continuous i/o latency sampling.
@@ -127,10 +124,8 @@ public:
         std::lock_guard lock(m_mutex);
         if (m_cancel)
             throw std::logic_error("io_latency_probe is canceled");
-        boost::asio::post(
-            m_ios,
-            sample_op<Handler>(
-                std::forward<Handler>(handler), Clock::now(), true, this));
+        m_ios.post(sample_op<Handler>(
+            std::forward<Handler>(handler), Clock::now(), true, this));
     }
 
 private:
@@ -241,13 +236,12 @@ private:
                     // The latency is too high to maintain the desired
                     // period so don't bother with a timer.
                     //
-                    boost::asio::post(
-                        m_probe->m_ios,
+                    m_probe->m_ios.post(
                         sample_op<Handler>(m_handler, now, m_repeat, m_probe));
                 }
                 else
                 {
-                    m_probe->m_timer.expires_after(when - now);
+                    m_probe->m_timer.expires_from_now(when - now);
                     m_probe->m_timer.async_wait(
                         sample_op<Handler>(m_handler, now, m_repeat, m_probe));
                 }
@@ -260,8 +254,7 @@ private:
             if (!m_probe)
                 return;
             typename Clock::time_point const now(Clock::now());
-            boost::asio::post(
-                m_probe->m_ios,
+            m_probe->m_ios.post(
                 sample_op<Handler>(m_handler, now, m_repeat, m_probe));
         }
     };
diff --git a/include/xrpl/beast/test/yield_to.h b/include/xrpl/beast/test/yield_to.h
index a222e8627e..27a3a2db20 100644
--- a/include/xrpl/beast/test/yield_to.h
+++ b/include/xrpl/beast/test/yield_to.h
@@ -8,11 +8,9 @@
 #ifndef BEAST_TEST_YIELD_TO_HPP
 #define BEAST_TEST_YIELD_TO_HPP
 
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/optional.hpp>
-#include <boost/thread/csbl/memory/allocator_arg.hpp>
 
 #include <condition_variable>
 #include <mutex>
@@ -31,12 +29,10 @@ namespace test {
 class enable_yield_to
 {
 protected:
-    boost::asio::io_context ios_;
+    boost::asio::io_service ios_;
 
 private:
-    boost::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
+    boost::optional<boost::asio::io_service::work> work_;
     std::vector<std::thread> threads_;
     std::mutex m_;
     std::condition_variable cv_;
@@ -46,8 +42,7 @@ public:
     /// The type of yield context passed to functions.
     using yield_context = boost::asio::yield_context;
 
-    explicit enable_yield_to(std::size_t concurrency = 1)
-        : work_(boost::asio::make_work_guard(ios_))
+    explicit enable_yield_to(std::size_t concurrency = 1) : work_(ios_)
     {
         threads_.reserve(concurrency);
         while (concurrency--)
@@ -61,9 +56,9 @@ public:
             t.join();
     }
 
-    /// Return the `io_context` associated with the object
-    boost::asio::io_context&
-    get_io_context()
+    /// Return the `io_service` associated with the object
+    boost::asio::io_service&
+    get_io_service()
     {
         return ios_;
     }
@@ -116,18 +111,13 @@ enable_yield_to::spawn(F0&& f, FN&&... fn)
 {
     boost::asio::spawn(
         ios_,
-        boost::allocator_arg,
-        boost::context::fixedsize_stack(2 * 1024 * 1024),
         [&](yield_context yield) {
             f(yield);
             std::lock_guard lock{m_};
             if (--running_ == 0)
                 cv_.notify_all();
         },
-        [](std::exception_ptr e) {
-            if (e)
-                std::rethrow_exception(e);
-        });
+        boost::coroutines::attributes(2 * 1024 * 1024));
     spawn(fn...);
 }
 
diff --git a/include/xrpl/json/json_reader.h b/include/xrpl/json/json_reader.h
index 8eceee1f1c..81866819a5 100644
--- a/include/xrpl/json/json_reader.h
+++ b/include/xrpl/json/json_reader.h
@@ -217,7 +217,7 @@ Reader::parse(Value& root, BufferSequence const& bs)
     std::string s;
     s.reserve(buffer_size(bs));
     for (auto const& b : bs)
-        s.append(static_cast<char const*>(b.data()), buffer_size(b));
+        s.append(buffer_cast<char const*>(b), buffer_size(b));
     return parse(s, root);
 }
 
diff --git a/include/xrpl/net/AutoSocket.h b/include/xrpl/net/AutoSocket.h
index 5f82854039..d06787340b 100644
--- a/include/xrpl/net/AutoSocket.h
+++ b/include/xrpl/net/AutoSocket.h
@@ -47,7 +47,7 @@ public:
 
 public:
     AutoSocket(
-        boost::asio::io_context& s,
+        boost::asio::io_service& s,
         boost::asio::ssl::context& c,
         bool secureOnly,
         bool plainOnly)
@@ -58,7 +58,7 @@ public:
         mSocket = std::make_unique<ssl_socket>(s, c);
     }
 
-    AutoSocket(boost::asio::io_context& s, boost::asio::ssl::context& c)
+    AutoSocket(boost::asio::io_service& s, boost::asio::ssl::context& c)
         : AutoSocket(s, c, false, false)
     {
     }
diff --git a/include/xrpl/net/HTTPClient.h b/include/xrpl/net/HTTPClient.h
index b5043cd024..ef295e8e5a 100644
--- a/include/xrpl/net/HTTPClient.h
+++ b/include/xrpl/net/HTTPClient.h
@@ -23,7 +23,7 @@
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/beast/utility/Journal.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/streambuf.hpp>
 
 #include <chrono>
@@ -51,7 +51,7 @@ public:
 
     static void
     get(bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         std::deque<std::string> deqSites,
         unsigned short const port,
         std::string const& strPath,
@@ -65,7 +65,7 @@ public:
 
     static void
     get(bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         std::string strSite,
         unsigned short const port,
         std::string const& strPath,
@@ -80,7 +80,7 @@ public:
     static void
     request(
         bool bSSL,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         std::string strSite,
         unsigned short const port,
         std::function<
diff --git a/include/xrpl/net/HTTPClientSSLContext.h b/include/xrpl/net/HTTPClientSSLContext.h
index f5dd1e54c6..2f7d6c005e 100644
--- a/include/xrpl/net/HTTPClientSSLContext.h
+++ b/include/xrpl/net/HTTPClientSSLContext.h
@@ -153,7 +153,7 @@ public:
             {
                 strm.set_verify_callback(
                     std::bind(
-                        &rfc6125_verify,
+                        &rfc2818_verify,
                         host,
                         std::placeholders::_1,
                         std::placeholders::_2,
@@ -167,7 +167,7 @@ public:
 
     /**
      * @brief callback invoked for name verification - just passes through
-     * to the asio `host_name_verification` (rfc6125) implementation.
+     * to the asio rfc2818 implementation.
      *
      * @param domain hostname expected
      * @param preverified passed by implementation
@@ -175,13 +175,13 @@ public:
      * @param j journal for logging
      */
     static bool
-    rfc6125_verify(
+    rfc2818_verify(
         std::string const& domain,
         bool preverified,
         boost::asio::ssl::verify_context& ctx,
         beast::Journal j)
     {
-        if (boost::asio::ssl::host_name_verification(domain)(preverified, ctx))
+        if (boost::asio::ssl::rfc2818_verification(domain)(preverified, ctx))
             return true;
 
         JLOG(j.warn()) << "Outbound SSL connection to " << domain
diff --git a/include/xrpl/server/Server.h b/include/xrpl/server/Server.h
index a8f9c7f8af..232d1c381b 100644
--- a/include/xrpl/server/Server.h
+++ b/include/xrpl/server/Server.h
@@ -25,7 +25,7 @@
 #include <xrpl/server/Port.h>
 #include <xrpl/server/detail/ServerImpl.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 namespace ripple {
 
@@ -34,10 +34,10 @@ template <class Handler>
 std::unique_ptr<Server>
 make_Server(
     Handler& handler,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     beast::Journal journal)
 {
-    return std::make_unique<ServerImpl<Handler>>(handler, io_context, journal);
+    return std::make_unique<ServerImpl<Handler>>(handler, io_service, journal);
 }
 
 }  // namespace ripple
diff --git a/include/xrpl/server/Session.h b/include/xrpl/server/Session.h
index 586172a5da..196f8c78c2 100644
--- a/include/xrpl/server/Session.h
+++ b/include/xrpl/server/Session.h
@@ -88,7 +88,9 @@ public:
              ++iter)
         {
             typename BufferSequence::value_type const& buffer(*iter);
-            write(buffer.data(), boost::asio::buffer_size(buffer));
+            write(
+                boost::asio::buffer_cast<void const*>(buffer),
+                boost::asio::buffer_size(buffer));
         }
     }
 
@@ -102,7 +104,7 @@ public:
 
     /** Detach the session.
         This holds the session open so that the response can be sent
-        asynchronously. Calls to io_context::run made by the server
+        asynchronously. Calls to io_service::run made by the server
         will not return until all detached sessions are closed.
     */
     virtual std::shared_ptr<Session>
diff --git a/include/xrpl/server/detail/BaseHTTPPeer.h b/include/xrpl/server/detail/BaseHTTPPeer.h
index b7f471bdee..b065a97cf0 100644
--- a/include/xrpl/server/detail/BaseHTTPPeer.h
+++ b/include/xrpl/server/detail/BaseHTTPPeer.h
@@ -24,13 +24,11 @@
 #include <xrpl/beast/net/IPAddressConversion.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/server/Session.h>
-#include <xrpl/server/detail/Spawn.h>
 #include <xrpl/server/detail/io_list.h>
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/asio/ssl/stream.hpp>
-#include <boost/asio/strand.hpp>
 #include <boost/asio/streambuf.hpp>
 #include <boost/beast/core/stream_traits.hpp>
 #include <boost/beast/http/dynamic_body.hpp>
@@ -217,8 +215,8 @@ BaseHTTPPeer<Handler, Impl>::BaseHTTPPeer(
     ConstBufferSequence const& buffers)
     : port_(port)
     , handler_(handler)
-    , work_(boost::asio::make_work_guard(executor))
-    , strand_(boost::asio::make_strand(executor))
+    , work_(executor)
+    , strand_(executor)
     , remote_address_(remote_address)
     , journal_(journal)
 {
@@ -358,7 +356,7 @@ BaseHTTPPeer<Handler, Impl>::on_write(
         return;
     if (graceful_)
         return do_close();
-    util::spawn(
+    boost::asio::spawn(
         strand_,
         std::bind(
             &BaseHTTPPeer<Handler, Impl>::do_read,
@@ -377,7 +375,7 @@ BaseHTTPPeer<Handler, Impl>::do_writer(
     {
         auto const p = impl().shared_from_this();
         resume = std::function<void(void)>([this, p, writer, keep_alive]() {
-            util::spawn(
+            boost::asio::spawn(
                 strand_,
                 std::bind(
                     &BaseHTTPPeer<Handler, Impl>::do_writer,
@@ -408,7 +406,7 @@ BaseHTTPPeer<Handler, Impl>::do_writer(
     if (!keep_alive)
         return do_close();
 
-    util::spawn(
+    boost::asio::spawn(
         strand_,
         std::bind(
             &BaseHTTPPeer<Handler, Impl>::do_read,
@@ -450,14 +448,14 @@ BaseHTTPPeer<Handler, Impl>::write(
     std::shared_ptr<Writer> const& writer,
     bool keep_alive)
 {
-    util::spawn(
+    boost::asio::spawn(bind_executor(
         strand_,
         std::bind(
             &BaseHTTPPeer<Handler, Impl>::do_writer,
             impl().shared_from_this(),
             writer,
             keep_alive,
-            std::placeholders::_1));
+            std::placeholders::_1)));
 }
 
 // DEPRECATED
@@ -492,12 +490,12 @@ BaseHTTPPeer<Handler, Impl>::complete()
     }
 
     // keep-alive
-    util::spawn(
+    boost::asio::spawn(bind_executor(
         strand_,
         std::bind(
             &BaseHTTPPeer<Handler, Impl>::do_read,
             impl().shared_from_this(),
-            std::placeholders::_1));
+            std::placeholders::_1)));
 }
 
 // DEPRECATED
diff --git a/include/xrpl/server/detail/BasePeer.h b/include/xrpl/server/detail/BasePeer.h
index 30de63e6ff..35975efafb 100644
--- a/include/xrpl/server/detail/BasePeer.h
+++ b/include/xrpl/server/detail/BasePeer.h
@@ -91,8 +91,8 @@ BasePeer<Handler, Impl>::BasePeer(
               return "##" + std::to_string(++id) + " ";
           }())
     , j_(sink_)
-    , work_(boost::asio::make_work_guard(executor))
-    , strand_(boost::asio::make_strand(executor))
+    , work_(executor)
+    , strand_(executor)
 {
 }
 
diff --git a/include/xrpl/server/detail/BaseWSPeer.h b/include/xrpl/server/detail/BaseWSPeer.h
index 391c5c337e..027b0cbf7c 100644
--- a/include/xrpl/server/detail/BaseWSPeer.h
+++ b/include/xrpl/server/detail/BaseWSPeer.h
@@ -29,7 +29,6 @@
 #include <xrpl/server/detail/BasePeer.h>
 #include <xrpl/server/detail/LowestLayer.h>
 
-#include <boost/asio/error.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/message.hpp>
 #include <boost/beast/websocket.hpp>
@@ -421,17 +420,11 @@ BaseWSPeer<Handler, Impl>::start_timer()
     // Max seconds without completing a message
     static constexpr std::chrono::seconds timeout{30};
     static constexpr std::chrono::seconds timeoutLocal{3};
-
-    try
-    {
-        timer_.expires_after(
-            remote_endpoint().address().is_loopback() ? timeoutLocal : timeout);
-    }
-    catch (boost::system::system_error const& e)
-    {
-        return fail(e.code(), "start_timer");
-    }
-
+    error_code ec;
+    timer_.expires_from_now(
+        remote_endpoint().address().is_loopback() ? timeoutLocal : timeout, ec);
+    if (ec)
+        return fail(ec, "start_timer");
     timer_.async_wait(bind_executor(
         strand_,
         std::bind(
@@ -445,14 +438,8 @@ template <class Handler, class Impl>
 void
 BaseWSPeer<Handler, Impl>::cancel_timer()
 {
-    try
-    {
-        timer_.cancel();
-    }
-    catch (boost::system::system_error const&)
-    {
-        // ignored
-    }
+    error_code ec;
+    timer_.cancel(ec);
 }
 
 template <class Handler, class Impl>
diff --git a/include/xrpl/server/detail/Door.h b/include/xrpl/server/detail/Door.h
index 7906af2a52..88e19db8cd 100644
--- a/include/xrpl/server/detail/Door.h
+++ b/include/xrpl/server/detail/Door.h
@@ -69,7 +69,7 @@ private:
         stream_type stream_;
         socket_type& socket_;
         endpoint_type remote_address_;
-        boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+        boost::asio::io_context::strand strand_;
         beast::Journal const j_;
 
     public:
@@ -95,7 +95,7 @@ private:
     Handler& handler_;
     boost::asio::io_context& ioc_;
     acceptor_type acceptor_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_context::strand strand_;
     bool ssl_;
     bool plain_;
 
@@ -155,7 +155,7 @@ Door<Handler>::Detector::Detector(
     , stream_(std::move(stream))
     , socket_(stream_.socket())
     , remote_address_(remote_address)
-    , strand_(boost::asio::make_strand(ioc_))
+    , strand_(ioc_)
     , j_(j)
 {
 }
@@ -164,7 +164,7 @@ template <class Handler>
 void
 Door<Handler>::Detector::run()
 {
-    util::spawn(
+    boost::asio::spawn(
         strand_,
         std::bind(
             &Detector::do_detect,
@@ -269,7 +269,7 @@ Door<Handler>::reOpen()
         Throw<std::exception>();
     }
 
-    acceptor_.listen(boost::asio::socket_base::max_listen_connections, ec);
+    acceptor_.listen(boost::asio::socket_base::max_connections, ec);
     if (ec)
     {
         JLOG(j_.error()) << "Listen on port '" << port_.name
@@ -291,7 +291,7 @@ Door<Handler>::Door(
     , handler_(handler)
     , ioc_(io_context)
     , acceptor_(io_context)
-    , strand_(boost::asio::make_strand(io_context))
+    , strand_(io_context)
     , ssl_(
           port_.protocol.count("https") > 0 ||
           port_.protocol.count("wss") > 0 || port_.protocol.count("wss2") > 0 ||
@@ -307,7 +307,7 @@ template <class Handler>
 void
 Door<Handler>::run()
 {
-    util::spawn(
+    boost::asio::spawn(
         strand_,
         std::bind(
             &Door<Handler>::do_accept,
@@ -320,8 +320,7 @@ void
 Door<Handler>::close()
 {
     if (!strand_.running_in_this_thread())
-        return boost::asio::post(
-            strand_,
+        return strand_.post(
             std::bind(&Door<Handler>::close, this->shared_from_this()));
     error_code ec;
     acceptor_.close(ec);
diff --git a/include/xrpl/server/detail/PlainHTTPPeer.h b/include/xrpl/server/detail/PlainHTTPPeer.h
index f6f8e5b010..ee31c78cad 100644
--- a/include/xrpl/server/detail/PlainHTTPPeer.h
+++ b/include/xrpl/server/detail/PlainHTTPPeer.h
@@ -105,7 +105,7 @@ PlainHTTPPeer<Handler>::run()
 {
     if (!this->handler_.onAccept(this->session(), this->remote_address_))
     {
-        util::spawn(
+        boost::asio::spawn(
             this->strand_,
             std::bind(&PlainHTTPPeer::do_close, this->shared_from_this()));
         return;
@@ -114,7 +114,7 @@ PlainHTTPPeer<Handler>::run()
     if (!socket_.is_open())
         return;
 
-    util::spawn(
+    boost::asio::spawn(
         this->strand_,
         std::bind(
             &PlainHTTPPeer::do_read,
diff --git a/include/xrpl/server/detail/SSLHTTPPeer.h b/include/xrpl/server/detail/SSLHTTPPeer.h
index 8564263114..fac4b866d3 100644
--- a/include/xrpl/server/detail/SSLHTTPPeer.h
+++ b/include/xrpl/server/detail/SSLHTTPPeer.h
@@ -115,14 +115,14 @@ SSLHTTPPeer<Handler>::run()
 {
     if (!this->handler_.onAccept(this->session(), this->remote_address_))
     {
-        util::spawn(
+        boost::asio::spawn(
             this->strand_,
             std::bind(&SSLHTTPPeer::do_close, this->shared_from_this()));
         return;
     }
     if (!socket_.is_open())
         return;
-    util::spawn(
+    boost::asio::spawn(
         this->strand_,
         std::bind(
             &SSLHTTPPeer::do_handshake,
@@ -164,7 +164,7 @@ SSLHTTPPeer<Handler>::do_handshake(yield_context do_yield)
         this->port().protocol.count("https") > 0;
     if (http)
     {
-        util::spawn(
+        boost::asio::spawn(
             this->strand_,
             std::bind(
                 &SSLHTTPPeer::do_read,
diff --git a/include/xrpl/server/detail/ServerImpl.h b/include/xrpl/server/detail/ServerImpl.h
index 4090aa0a6b..fd0b082b46 100644
--- a/include/xrpl/server/detail/ServerImpl.h
+++ b/include/xrpl/server/detail/ServerImpl.h
@@ -26,8 +26,6 @@
 #include <xrpl/server/detail/io_list.h>
 
 #include <boost/asio.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
 
 #include <array>
 #include <chrono>
@@ -87,11 +85,9 @@ private:
 
     Handler& handler_;
     beast::Journal const j_;
-    boost::asio::io_context& io_context_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
+    boost::asio::io_service& io_service_;
+    boost::asio::io_service::strand strand_;
+    std::optional<boost::asio::io_service::work> work_;
 
     std::mutex m_;
     std::vector<Port> ports_;
@@ -104,7 +100,7 @@ private:
 public:
     ServerImpl(
         Handler& handler,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         beast::Journal journal);
 
     ~ServerImpl();
@@ -127,10 +123,10 @@ public:
         return ios_;
     }
 
-    boost::asio::io_context&
-    get_io_context()
+    boost::asio::io_service&
+    get_io_service()
     {
-        return io_context_;
+        return io_service_;
     }
 
     bool
@@ -144,13 +140,13 @@ private:
 template <class Handler>
 ServerImpl<Handler>::ServerImpl(
     Handler& handler,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     beast::Journal journal)
     : handler_(handler)
     , j_(journal)
-    , io_context_(io_context)
-    , strand_(boost::asio::make_strand(io_context_))
-    , work_(std::in_place, boost::asio::make_work_guard(io_context_))
+    , io_service_(io_service)
+    , strand_(io_service_)
+    , work_(io_service_)
 {
 }
 
@@ -177,7 +173,7 @@ ServerImpl<Handler>::ports(std::vector<Port> const& ports)
         ports_.push_back(port);
         auto& internalPort = ports_.back();
         if (auto sp = ios_.emplace<Door<Handler>>(
-                handler_, io_context_, internalPort, j_))
+                handler_, io_service_, internalPort, j_))
         {
             list_.push_back(sp);
 
diff --git a/include/xrpl/server/detail/Spawn.h b/include/xrpl/server/detail/Spawn.h
deleted file mode 100644
index 56f173dec3..0000000000
--- a/include/xrpl/server/detail/Spawn.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of rippled: https://github.com/ripple/rippled
-    Copyright(c) 2025 Ripple Labs Inc.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_SERVER_SPAWN_H_INCLUDED
-#define RIPPLE_SERVER_SPAWN_H_INCLUDED
-
-#include <xrpl/basics/Log.h>
-
-#include <boost/asio/spawn.hpp>
-#include <boost/asio/strand.hpp>
-
-#include <concepts>
-#include <type_traits>
-
-namespace ripple::util {
-namespace impl {
-
-template <typename T>
-concept IsStrand = std::same_as<
-    std::decay_t<T>,
-    boost::asio::strand<typename std::decay_t<T>::inner_executor_type>>;
-
-/**
- * @brief A completion handler that restores `boost::asio::spawn`'s behaviour
- * from Boost 1.83
- *
- * This is intended to be passed as the third argument to `boost::asio::spawn`
- * so that exceptions are not ignored but propagated to `io_context.run()` call
- * site.
- *
- * @param ePtr The exception that was caught on the coroutine
- */
-inline constexpr auto kPROPAGATE_EXCEPTIONS = [](std::exception_ptr ePtr) {
-    if (ePtr)
-    {
-        try
-        {
-            std::rethrow_exception(ePtr);
-        }
-        catch (std::exception const& e)
-        {
-            JLOG(debugLog().warn()) << "Spawn exception: " << e.what();
-            throw;
-        }
-        catch (...)
-        {
-            JLOG(debugLog().warn()) << "Spawn exception: Unknown";
-            throw;
-        }
-    }
-};
-
-}  // namespace impl
-
-/**
- * @brief Spawns a coroutine using `boost::asio::spawn`
- *
- * @note This uses kPROPAGATE_EXCEPTIONS to force asio to propagate exceptions
- * through `io_context`
- * @note Since implicit strand was removed from boost::asio::spawn this helper
- * function adds the strand back
- *
- * @tparam Ctx The type of the context/strand
- * @tparam F The type of the function to execute
- * @param ctx The execution context
- * @param func The function to execute. Must return `void`
- */
-template <typename Ctx, typename F>
-    requires std::is_invocable_r_v<void, F, boost::asio::yield_context>
-void
-spawn(Ctx&& ctx, F&& func)
-{
-    if constexpr (impl::IsStrand<Ctx>)
-    {
-        boost::asio::spawn(
-            std::forward<Ctx>(ctx),
-            std::forward<F>(func),
-            impl::kPROPAGATE_EXCEPTIONS);
-    }
-    else
-    {
-        boost::asio::spawn(
-            boost::asio::make_strand(
-                boost::asio::get_associated_executor(std::forward<Ctx>(ctx))),
-            std::forward<F>(func),
-            impl::kPROPAGATE_EXCEPTIONS);
-    }
-}
-
-}  // namespace ripple::util
-
-#endif
diff --git a/include/xrpl/server/detail/io_list.h b/include/xrpl/server/detail/io_list.h
index 6292794864..fba8b28f87 100644
--- a/include/xrpl/server/detail/io_list.h
+++ b/include/xrpl/server/detail/io_list.h
@@ -166,7 +166,7 @@ public:
             May be called concurrently.
 
         Preconditions:
-            No call to io_context::run on any io_context
+            No call to io_service::run on any io_service
             used by work objects associated with this io_list
             exists in the caller's call stack.
     */
diff --git a/src/libxrpl/basics/ResolverAsio.cpp b/src/libxrpl/basics/ResolverAsio.cpp
index 1b52465a80..fde27189e7 100644
--- a/src/libxrpl/basics/ResolverAsio.cpp
+++ b/src/libxrpl/basics/ResolverAsio.cpp
@@ -25,9 +25,8 @@
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
-#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/system/detail/error_code.hpp>
 
@@ -125,8 +124,8 @@ public:
 
     beast::Journal m_journal;
 
-    boost::asio::io_context& m_io_context;
-    boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
+    boost::asio::io_service& m_io_service;
+    boost::asio::io_service::strand m_strand;
     boost::asio::ip::tcp::resolver m_resolver;
 
     std::condition_variable m_cv;
@@ -156,12 +155,12 @@ public:
     std::deque<Work> m_work;
 
     ResolverAsioImpl(
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         beast::Journal journal)
         : m_journal(journal)
-        , m_io_context(io_context)
-        , m_strand(boost::asio::make_strand(io_context))
-        , m_resolver(io_context)
+        , m_io_service(io_service)
+        , m_strand(io_service)
+        , m_resolver(io_service)
         , m_asyncHandlersCompleted(true)
         , m_stop_called(false)
         , m_stopped(true)
@@ -217,14 +216,8 @@ public:
     {
         if (m_stop_called.exchange(true) == false)
         {
-            boost::asio::dispatch(
-                m_io_context,
-                boost::asio::bind_executor(
-                    m_strand,
-                    std::bind(
-                        &ResolverAsioImpl::do_stop,
-                        this,
-                        CompletionCounter(this))));
+            m_io_service.dispatch(m_strand.wrap(std::bind(
+                &ResolverAsioImpl::do_stop, this, CompletionCounter(this))));
 
             JLOG(m_journal.debug()) << "Queued a stop request";
         }
@@ -255,16 +248,12 @@ public:
 
         // TODO NIKB use rvalue references to construct and move
         //           reducing cost.
-        boost::asio::dispatch(
-            m_io_context,
-            boost::asio::bind_executor(
-                m_strand,
-                std::bind(
-                    &ResolverAsioImpl::do_resolve,
-                    this,
-                    names,
-                    handler,
-                    CompletionCounter(this))));
+        m_io_service.dispatch(m_strand.wrap(std::bind(
+            &ResolverAsioImpl::do_resolve,
+            this,
+            names,
+            handler,
+            CompletionCounter(this))));
     }
 
     //-------------------------------------------------------------------------
@@ -290,20 +279,19 @@ public:
         std::string name,
         boost::system::error_code const& ec,
         HandlerType handler,
-        boost::asio::ip::tcp::resolver::results_type results,
+        boost::asio::ip::tcp::resolver::iterator iter,
         CompletionCounter)
     {
         if (ec == boost::asio::error::operation_aborted)
             return;
 
         std::vector<beast::IP::Endpoint> addresses;
-        auto iter = results.begin();
 
         // If we get an error message back, we don't return any
         // results that we may have gotten.
         if (!ec)
         {
-            while (iter != results.end())
+            while (iter != boost::asio::ip::tcp::resolver::iterator())
             {
                 addresses.push_back(
                     beast::IPAddressConversion::from_asio(*iter));
@@ -313,14 +301,8 @@ public:
 
         handler(name, addresses);
 
-        boost::asio::post(
-            m_io_context,
-            boost::asio::bind_executor(
-                m_strand,
-                std::bind(
-                    &ResolverAsioImpl::do_work,
-                    this,
-                    CompletionCounter(this))));
+        m_io_service.post(m_strand.wrap(std::bind(
+            &ResolverAsioImpl::do_work, this, CompletionCounter(this))));
     }
 
     HostAndPort
@@ -401,21 +383,16 @@ public:
         {
             JLOG(m_journal.error()) << "Unable to parse '" << name << "'";
 
-            boost::asio::post(
-                m_io_context,
-                boost::asio::bind_executor(
-                    m_strand,
-                    std::bind(
-                        &ResolverAsioImpl::do_work,
-                        this,
-                        CompletionCounter(this))));
+            m_io_service.post(m_strand.wrap(std::bind(
+                &ResolverAsioImpl::do_work, this, CompletionCounter(this))));
 
             return;
         }
 
+        boost::asio::ip::tcp::resolver::query query(host, port);
+
         m_resolver.async_resolve(
-            host,
-            port,
+            query,
             std::bind(
                 &ResolverAsioImpl::do_finish,
                 this,
@@ -446,14 +423,10 @@ public:
 
             if (m_work.size() > 0)
             {
-                boost::asio::post(
-                    m_io_context,
-                    boost::asio::bind_executor(
-                        m_strand,
-                        std::bind(
-                            &ResolverAsioImpl::do_work,
-                            this,
-                            CompletionCounter(this))));
+                m_io_service.post(m_strand.wrap(std::bind(
+                    &ResolverAsioImpl::do_work,
+                    this,
+                    CompletionCounter(this))));
             }
         }
     }
@@ -462,9 +435,9 @@ public:
 //-----------------------------------------------------------------------------
 
 std::unique_ptr<ResolverAsio>
-ResolverAsio::New(boost::asio::io_context& io_context, beast::Journal journal)
+ResolverAsio::New(boost::asio::io_service& io_service, beast::Journal journal)
 {
-    return std::make_unique<ResolverAsioImpl>(io_context, journal);
+    return std::make_unique<ResolverAsioImpl>(io_service, journal);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/libxrpl/beast/insight/StatsDCollector.cpp b/src/libxrpl/beast/insight/StatsDCollector.cpp
index 7a3929e0d5..b0e00c3cfd 100644
--- a/src/libxrpl/beast/insight/StatsDCollector.cpp
+++ b/src/libxrpl/beast/insight/StatsDCollector.cpp
@@ -30,11 +30,9 @@
 #include <xrpl/beast/utility/instrumentation.h>
 
 #include <boost/asio/basic_waitable_timer.hpp>
-#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/error.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/udp.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/system/detail/error_code.hpp>
@@ -240,11 +238,9 @@ private:
     Journal m_journal;
     IP::Endpoint m_address;
     std::string m_prefix;
-    boost::asio::io_context m_io_context;
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        m_work;
-    boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
+    boost::asio::io_service m_io_service;
+    std::optional<boost::asio::io_service::work> m_work;
+    boost::asio::io_service::strand m_strand;
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> m_timer;
     boost::asio::ip::udp::socket m_socket;
     std::deque<std::string> m_data;
@@ -268,24 +264,18 @@ public:
         : m_journal(journal)
         , m_address(address)
         , m_prefix(prefix)
-        , m_work(boost::asio::make_work_guard(m_io_context))
-        , m_strand(boost::asio::make_strand(m_io_context))
-        , m_timer(m_io_context)
-        , m_socket(m_io_context)
+        , m_work(std::ref(m_io_service))
+        , m_strand(m_io_service)
+        , m_timer(m_io_service)
+        , m_socket(m_io_service)
         , m_thread(&StatsDCollectorImp::run, this)
     {
     }
 
     ~StatsDCollectorImp() override
     {
-        try
-        {
-            m_timer.cancel();
-        }
-        catch (boost::system::system_error const&)
-        {
-            // ignored
-        }
+        boost::system::error_code ec;
+        m_timer.cancel(ec);
 
         m_work.reset();
         m_thread.join();
@@ -344,10 +334,10 @@ public:
 
     //--------------------------------------------------------------------------
 
-    boost::asio::io_context&
-    get_io_context()
+    boost::asio::io_service&
+    get_io_service()
     {
-        return m_io_context;
+        return m_io_service;
     }
 
     std::string const&
@@ -365,14 +355,8 @@ public:
     void
     post_buffer(std::string&& buffer)
     {
-        boost::asio::dispatch(
-            m_io_context,
-            boost::asio::bind_executor(
-                m_strand,
-                std::bind(
-                    &StatsDCollectorImp::do_post_buffer,
-                    this,
-                    std::move(buffer))));
+        m_io_service.dispatch(m_strand.wrap(std::bind(
+            &StatsDCollectorImp::do_post_buffer, this, std::move(buffer))));
     }
 
     // The keepAlive parameter makes sure the buffers sent to
@@ -402,7 +386,8 @@ public:
         for (auto const& buffer : buffers)
         {
             std::string const s(
-                buffer.data(), boost::asio::buffer_size(buffer));
+                boost::asio::buffer_cast<char const*>(buffer),
+                boost::asio::buffer_size(buffer));
             std::cerr << s;
         }
         std::cerr << '\n';
@@ -471,7 +456,7 @@ public:
     set_timer()
     {
         using namespace std::chrono_literals;
-        m_timer.expires_after(1s);
+        m_timer.expires_from_now(1s);
         m_timer.async_wait(std::bind(
             &StatsDCollectorImp::on_timer, this, std::placeholders::_1));
     }
@@ -513,13 +498,13 @@ public:
 
         set_timer();
 
-        m_io_context.run();
+        m_io_service.run();
 
         m_socket.shutdown(boost::asio::ip::udp::socket::shutdown_send, ec);
 
         m_socket.close();
 
-        m_io_context.poll();
+        m_io_service.poll();
     }
 };
 
@@ -562,12 +547,10 @@ StatsDCounterImpl::~StatsDCounterImpl()
 void
 StatsDCounterImpl::increment(CounterImpl::value_type amount)
 {
-    boost::asio::dispatch(
-        m_impl->get_io_context(),
-        std::bind(
-            &StatsDCounterImpl::do_increment,
-            std::static_pointer_cast<StatsDCounterImpl>(shared_from_this()),
-            amount));
+    m_impl->get_io_service().dispatch(std::bind(
+        &StatsDCounterImpl::do_increment,
+        std::static_pointer_cast<StatsDCounterImpl>(shared_from_this()),
+        amount));
 }
 
 void
@@ -609,12 +592,10 @@ StatsDEventImpl::StatsDEventImpl(
 void
 StatsDEventImpl::notify(EventImpl::value_type const& value)
 {
-    boost::asio::dispatch(
-        m_impl->get_io_context(),
-        std::bind(
-            &StatsDEventImpl::do_notify,
-            std::static_pointer_cast<StatsDEventImpl>(shared_from_this()),
-            value));
+    m_impl->get_io_service().dispatch(std::bind(
+        &StatsDEventImpl::do_notify,
+        std::static_pointer_cast<StatsDEventImpl>(shared_from_this()),
+        value));
 }
 
 void
@@ -644,23 +625,19 @@ StatsDGaugeImpl::~StatsDGaugeImpl()
 void
 StatsDGaugeImpl::set(GaugeImpl::value_type value)
 {
-    boost::asio::dispatch(
-        m_impl->get_io_context(),
-        std::bind(
-            &StatsDGaugeImpl::do_set,
-            std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
-            value));
+    m_impl->get_io_service().dispatch(std::bind(
+        &StatsDGaugeImpl::do_set,
+        std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
+        value));
 }
 
 void
 StatsDGaugeImpl::increment(GaugeImpl::difference_type amount)
 {
-    boost::asio::dispatch(
-        m_impl->get_io_context(),
-        std::bind(
-            &StatsDGaugeImpl::do_increment,
-            std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
-            amount));
+    m_impl->get_io_service().dispatch(std::bind(
+        &StatsDGaugeImpl::do_increment,
+        std::static_pointer_cast<StatsDGaugeImpl>(shared_from_this()),
+        amount));
 }
 
 void
@@ -736,12 +713,10 @@ StatsDMeterImpl::~StatsDMeterImpl()
 void
 StatsDMeterImpl::increment(MeterImpl::value_type amount)
 {
-    boost::asio::dispatch(
-        m_impl->get_io_context(),
-        std::bind(
-            &StatsDMeterImpl::do_increment,
-            std::static_pointer_cast<StatsDMeterImpl>(shared_from_this()),
-            amount));
+    m_impl->get_io_service().dispatch(std::bind(
+        &StatsDMeterImpl::do_increment,
+        std::static_pointer_cast<StatsDMeterImpl>(shared_from_this()),
+        amount));
 }
 
 void
diff --git a/src/libxrpl/beast/net/IPAddressV4.cpp b/src/libxrpl/beast/net/IPAddressV4.cpp
index 22162c2bbe..29455024f6 100644
--- a/src/libxrpl/beast/net/IPAddressV4.cpp
+++ b/src/libxrpl/beast/net/IPAddressV4.cpp
@@ -25,11 +25,11 @@ namespace IP {
 bool
 is_private(AddressV4 const& addr)
 {
-    return ((addr.to_uint() & 0xff000000) ==
+    return ((addr.to_ulong() & 0xff000000) ==
             0x0a000000) ||  // Prefix /8,    10.  #.#.#
-        ((addr.to_uint() & 0xfff00000) ==
+        ((addr.to_ulong() & 0xfff00000) ==
          0xac100000) ||  // Prefix /12   172. 16.#.# - 172.31.#.#
-        ((addr.to_uint() & 0xffff0000) ==
+        ((addr.to_ulong() & 0xffff0000) ==
          0xc0a80000) ||  // Prefix /16   192.168.#.#
         addr.is_loopback();
 }
@@ -44,7 +44,7 @@ char
 get_class(AddressV4 const& addr)
 {
     static char const* table = "AAAABBCD";
-    return table[(addr.to_uint() & 0xE0000000) >> 29];
+    return table[(addr.to_ulong() & 0xE0000000) >> 29];
 }
 
 }  // namespace IP
diff --git a/src/libxrpl/beast/net/IPAddressV6.cpp b/src/libxrpl/beast/net/IPAddressV6.cpp
index d1b86ba9bd..f90a6d066b 100644
--- a/src/libxrpl/beast/net/IPAddressV6.cpp
+++ b/src/libxrpl/beast/net/IPAddressV6.cpp
@@ -20,8 +20,6 @@
 #include <xrpl/beast/net/IPAddressV4.h>
 #include <xrpl/beast/net/IPAddressV6.h>
 
-#include <boost/asio/ip/address_v4.hpp>
-
 namespace beast {
 namespace IP {
 
@@ -30,9 +28,7 @@ is_private(AddressV6 const& addr)
 {
     return (
         (addr.to_bytes()[0] & 0xfd) ||  // TODO  fc00::/8 too ?
-        (addr.is_v4_mapped() &&
-         is_private(boost::asio::ip::make_address_v4(
-             boost::asio::ip::v4_mapped, addr))));
+        (addr.is_v4_mapped() && is_private(addr.to_v4())));
 }
 
 bool
diff --git a/src/libxrpl/beast/net/IPEndpoint.cpp b/src/libxrpl/beast/net/IPEndpoint.cpp
index f1ffc23e82..ffe664498c 100644
--- a/src/libxrpl/beast/net/IPEndpoint.cpp
+++ b/src/libxrpl/beast/net/IPEndpoint.cpp
@@ -21,8 +21,6 @@
 #include <xrpl/beast/net/IPEndpoint.h>
 
 #include <boost/algorithm/string/trim.hpp>
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ip/address_v4.hpp>
 #include <boost/system/detail/error_code.hpp>
 
 #include <cctype>
@@ -169,7 +167,7 @@ operator>>(std::istream& is, Endpoint& endpoint)
     }
 
     boost::system::error_code ec;
-    auto addr = boost::asio::ip::make_address(addrStr, ec);
+    auto addr = Address::from_string(addrStr, ec);
     if (ec)
     {
         is.setstate(std::ios_base::failbit);
diff --git a/src/libxrpl/net/HTTPClient.cpp b/src/libxrpl/net/HTTPClient.cpp
index 74b8b61ca6..2b3643e698 100644
--- a/src/libxrpl/net/HTTPClient.cpp
+++ b/src/libxrpl/net/HTTPClient.cpp
@@ -24,7 +24,6 @@
 #include <xrpl/net/HTTPClientSSLContext.h>
 
 #include <boost/asio.hpp>
-#include <boost/asio/ip/resolver_query_base.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/regex.hpp>
@@ -56,16 +55,16 @@ class HTTPClientImp : public std::enable_shared_from_this<HTTPClientImp>,
 {
 public:
     HTTPClientImp(
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         unsigned short const port,
         std::size_t maxResponseSize,
         beast::Journal& j)
-        : mSocket(io_context, httpClientSSLContext->context())
-        , mResolver(io_context)
+        : mSocket(io_service, httpClientSSLContext->context())
+        , mResolver(io_service)
         , mHeader(maxClientHeaderBytes)
         , mPort(port)
         , maxResponseSize_(maxResponseSize)
-        , mDeadline(io_context)
+        , mDeadline(io_service)
         , j_(j)
     {
     }
@@ -147,21 +146,18 @@ public:
     {
         JLOG(j_.trace()) << "Fetch: " << mDeqSites[0];
 
-        auto query = std::make_shared<Query>(
+        auto query = std::make_shared<boost::asio::ip::tcp::resolver::query>(
             mDeqSites[0],
             std::to_string(mPort),
             boost::asio::ip::resolver_query_base::numeric_service);
         mQuery = query;
 
-        try
-        {
-            mDeadline.expires_after(mTimeout);
-        }
-        catch (boost::system::system_error const& e)
-        {
-            mShutdown = e.code();
+        mDeadline.expires_from_now(mTimeout, mShutdown);
 
-            JLOG(j_.trace()) << "expires_after: " << mShutdown.message();
+        JLOG(j_.trace()) << "expires_from_now: " << mShutdown.message();
+
+        if (!mShutdown)
+        {
             mDeadline.async_wait(std::bind(
                 &HTTPClientImp::handleDeadline,
                 shared_from_this(),
@@ -173,9 +169,7 @@ public:
             JLOG(j_.trace()) << "Resolving: " << mDeqSites[0];
 
             mResolver.async_resolve(
-                mQuery->host,
-                mQuery->port,
-                mQuery->flags,
+                *mQuery,
                 std::bind(
                     &HTTPClientImp::handleResolve,
                     shared_from_this(),
@@ -239,7 +233,7 @@ public:
     void
     handleResolve(
         boost::system::error_code const& ecResult,
-        boost::asio::ip::tcp::resolver::results_type result)
+        boost::asio::ip::tcp::resolver::iterator itrEndpoint)
     {
         if (!mShutdown)
         {
@@ -261,7 +255,7 @@ public:
 
             boost::asio::async_connect(
                 mSocket.lowest_layer(),
-                result,
+                itrEndpoint,
                 std::bind(
                     &HTTPClientImp::handleConnect,
                     shared_from_this(),
@@ -481,15 +475,13 @@ public:
         std::string const& strData = "")
     {
         boost::system::error_code ecCancel;
-        try
+
+        (void)mDeadline.cancel(ecCancel);
+
+        if (ecCancel)
         {
-            mDeadline.cancel();
-        }
-        catch (boost::system::system_error const& e)
-        {
-            JLOG(j_.trace())
-                << "invokeComplete: Deadline cancel error: " << e.what();
-            ecCancel = e.code();
+            JLOG(j_.trace()) << "invokeComplete: Deadline cancel error: "
+                             << ecCancel.message();
         }
 
         JLOG(j_.debug()) << "invokeComplete: Deadline popping: "
@@ -523,15 +515,7 @@ private:
     bool mSSL;
     AutoSocket mSocket;
     boost::asio::ip::tcp::resolver mResolver;
-
-    struct Query
-    {
-        std::string host;
-        std::string port;
-        boost::asio::ip::resolver_query_base::flags flags;
-    };
-    std::shared_ptr<Query> mQuery;
-
+    std::shared_ptr<boost::asio::ip::tcp::resolver::query> mQuery;
     boost::asio::streambuf mRequest;
     boost::asio::streambuf mHeader;
     boost::asio::streambuf mResponse;
@@ -562,7 +546,7 @@ private:
 void
 HTTPClient::get(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     std::deque<std::string> deqSites,
     unsigned short const port,
     std::string const& strPath,
@@ -575,14 +559,14 @@ HTTPClient::get(
     beast::Journal& j)
 {
     auto client =
-        std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+        std::make_shared<HTTPClientImp>(io_service, port, responseMax, j);
     client->get(bSSL, deqSites, strPath, timeout, complete);
 }
 
 void
 HTTPClient::get(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     std::string strSite,
     unsigned short const port,
     std::string const& strPath,
@@ -597,14 +581,14 @@ HTTPClient::get(
     std::deque<std::string> deqSites(1, strSite);
 
     auto client =
-        std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+        std::make_shared<HTTPClientImp>(io_service, port, responseMax, j);
     client->get(bSSL, deqSites, strPath, timeout, complete);
 }
 
 void
 HTTPClient::request(
     bool bSSL,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     std::string strSite,
     unsigned short const port,
     std::function<void(boost::asio::streambuf& sb, std::string const& strHost)>
@@ -620,7 +604,7 @@ HTTPClient::request(
     std::deque<std::string> deqSites(1, strSite);
 
     auto client =
-        std::make_shared<HTTPClientImp>(io_context, port, responseMax, j);
+        std::make_shared<HTTPClientImp>(io_service, port, responseMax, j);
     client->request(bSSL, deqSites, setRequest, timeout, complete);
 }
 
diff --git a/src/libxrpl/server/Port.cpp b/src/libxrpl/server/Port.cpp
index be86a77a9f..95709fc298 100644
--- a/src/libxrpl/server/Port.cpp
+++ b/src/libxrpl/server/Port.cpp
@@ -36,7 +36,6 @@
 #include <exception>
 #include <ostream>
 #include <sstream>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -220,7 +219,7 @@ parse_Port(ParsedPort& port, Section const& section, std::ostream& log)
         {
             try
             {
-                port.ip = boost::asio::ip::make_address(*optResult);
+                port.ip = boost::asio::ip::address::from_string(*optResult);
             }
             catch (std::exception const&)
             {
diff --git a/src/test/app/DNS_test.cpp b/src/test/app/DNS_test.cpp
index c4e476de9f..28a143e93d 100644
--- a/src/test/app/DNS_test.cpp
+++ b/src/test/app/DNS_test.cpp
@@ -63,7 +63,7 @@ public:
             pUrl_.domain,
             pUrl_.path,
             port_,
-            env_.app().getIOContext(),
+            env_.app().getIOService(),
             env_.journal,
             env_.app().config(),
             lastEndpoint,
@@ -80,11 +80,10 @@ public:
     isMultipleEndpoints()
     {
         using boost::asio::ip::tcp;
-        tcp::resolver resolver(env_.app().getIOContext());
+        tcp::resolver resolver(env_.app().getIOService());
         std::string port = pUrl_.port ? std::to_string(*pUrl_.port) : "443";
-        auto results = resolver.resolve(pUrl_.domain, port);
-        auto it = results.begin();
-        auto end = results.end();
+        tcp::resolver::iterator it = resolver.resolve(pUrl_.domain, port);
+        tcp::resolver::iterator end;
         int n = 0;
         for (; it != end; ++it)
             ++n;
diff --git a/src/test/app/LedgerReplay_test.cpp b/src/test/app/LedgerReplay_test.cpp
index 88d944d789..76ab5b3218 100644
--- a/src/test/app/LedgerReplay_test.cpp
+++ b/src/test/app/LedgerReplay_test.cpp
@@ -1107,7 +1107,7 @@ struct LedgerReplayer_test : public beast::unit_test::suite
                 return false;
 
             beast::IP::Address addr =
-                boost::asio::ip::make_address("172.1.1.100");
+                boost::asio::ip::address::from_string("172.1.1.100");
             jtx::Env serverEnv(*this);
             serverEnv.app().config().LEDGER_REPLAY = server;
             auto http_resp = ripple::makeResponse(
diff --git a/src/test/app/ValidatorSite_test.cpp b/src/test/app/ValidatorSite_test.cpp
index cd60a5ed99..840a6cdb43 100644
--- a/src/test/app/ValidatorSite_test.cpp
+++ b/src/test/app/ValidatorSite_test.cpp
@@ -205,7 +205,7 @@ private:
             NetClock::time_point const expires2 =
                 effective2 + cfg.expiresFromNow;
             item.server = make_TrustedPublisherServer(
-                env.app().getIOContext(),
+                env.app().getIOService(),
                 item.list,
                 expires,
                 {{effective2, expires2}},
diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp
index a99dccf5a0..aed6d715d4 100644
--- a/src/test/beast/IPEndpoint_test.cpp
+++ b/src/test/beast/IPEndpoint_test.cpp
@@ -45,13 +45,13 @@ public:
         std::string const& normal = "")
     {
         boost::system::error_code ec;
-        Address const result{boost::asio::ip::make_address(s, ec)};
+        Address const result{Address::from_string(s, ec)};
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
         if (!BEAST_EXPECTS(result.is_v4(), s + " not v4"))
             return;
         if (!BEAST_EXPECTS(
-                result.to_v4().to_uint() == value, s + " value mismatch"))
+                result.to_v4().to_ulong() == value, s + " value mismatch"))
             return;
         BEAST_EXPECTS(
             result.to_string() == (normal.empty() ? s : normal),
@@ -62,7 +62,7 @@ public:
     failParseAddr(std::string const& s)
     {
         boost::system::error_code ec;
-        auto a = boost::asio::ip::make_address(s, ec);
+        auto a = Address::from_string(s, ec);
         BEAST_EXPECTS(ec, s + " parses as " + a.to_string());
     }
 
@@ -71,24 +71,24 @@ public:
     {
         testcase("AddressV4");
 
-        BEAST_EXPECT(AddressV4{}.to_uint() == 0);
+        BEAST_EXPECT(AddressV4{}.to_ulong() == 0);
         BEAST_EXPECT(is_unspecified(AddressV4{}));
-        BEAST_EXPECT(AddressV4{0x01020304}.to_uint() == 0x01020304);
+        BEAST_EXPECT(AddressV4{0x01020304}.to_ulong() == 0x01020304);
 
         {
             AddressV4::bytes_type d = {{1, 2, 3, 4}};
-            BEAST_EXPECT(AddressV4{d}.to_uint() == 0x01020304);
+            BEAST_EXPECT(AddressV4{d}.to_ulong() == 0x01020304);
 
             unexpected(is_unspecified(AddressV4{d}));
         }
 
         AddressV4 const v1{1};
-        BEAST_EXPECT(AddressV4{v1}.to_uint() == 1);
+        BEAST_EXPECT(AddressV4{v1}.to_ulong() == 1);
 
         {
             AddressV4 v;
             v = v1;
-            BEAST_EXPECT(v.to_uint() == v1.to_uint());
+            BEAST_EXPECT(v.to_ulong() == v1.to_ulong());
         }
 
         {
@@ -99,7 +99,7 @@ public:
             d[2] = 3;
             d[3] = 4;
             v = AddressV4{d};
-            BEAST_EXPECT(v.to_uint() == 0x01020304);
+            BEAST_EXPECT(v.to_ulong() == 0x01020304);
         }
 
         BEAST_EXPECT(AddressV4(0x01020304).to_string() == "1.2.3.4");
@@ -161,7 +161,7 @@ public:
         testcase("Address");
 
         boost::system::error_code ec;
-        Address result{boost::asio::ip::make_address("1.2.3.4", ec)};
+        Address result{Address::from_string("1.2.3.4", ec)};
         AddressV4::bytes_type d = {{1, 2, 3, 4}};
         BEAST_EXPECT(!ec);
         BEAST_EXPECT(result.is_v4() && result.to_v4() == AddressV4{d});
@@ -263,10 +263,7 @@ public:
         BEAST_EXPECT(is_loopback(ep));
         BEAST_EXPECT(to_string(ep) == "127.0.0.1:80");
         // same address as v4 mapped in ipv6
-        ep = Endpoint(
-            boost::asio::ip::make_address_v6(
-                boost::asio::ip::v4_mapped, AddressV4{d}),
-            80);
+        ep = Endpoint(AddressV6::v4_mapped(AddressV4{d}), 80);
         BEAST_EXPECT(!is_unspecified(ep));
         BEAST_EXPECT(!is_public(ep));
         BEAST_EXPECT(is_private(ep));
@@ -284,11 +281,8 @@ public:
         BEAST_EXPECT(!is_loopback(ep));
         BEAST_EXPECT(to_string(ep) == "10.0.0.1");
         // same address as v4 mapped in ipv6
-        ep = Endpoint(boost::asio::ip::make_address_v6(
-            boost::asio::ip::v4_mapped, AddressV4{d}));
-        BEAST_EXPECT(
-            get_class(boost::asio::ip::make_address_v4(
-                boost::asio::ip::v4_mapped, ep.to_v6())) == 'A');
+        ep = Endpoint(AddressV6::v4_mapped(AddressV4{d}));
+        BEAST_EXPECT(get_class(ep.to_v6().to_v4()) == 'A');
         BEAST_EXPECT(!is_unspecified(ep));
         BEAST_EXPECT(!is_public(ep));
         BEAST_EXPECT(is_private(ep));
@@ -305,8 +299,7 @@ public:
         BEAST_EXPECT(!is_loopback(ep));
         BEAST_EXPECT(to_string(ep) == "166.78.151.147");
         // same address as v4 mapped in ipv6
-        ep = Endpoint(boost::asio::ip::make_address_v6(
-            boost::asio::ip::v4_mapped, AddressV4{d}));
+        ep = Endpoint(AddressV6::v4_mapped(AddressV4{d}));
         BEAST_EXPECT(!is_unspecified(ep));
         BEAST_EXPECT(is_public(ep));
         BEAST_EXPECT(!is_private(ep));
diff --git a/src/test/beast/beast_io_latency_probe_test.cpp b/src/test/beast/beast_io_latency_probe_test.cpp
index 841272d05a..c72336bf27 100644
--- a/src/test/beast/beast_io_latency_probe_test.cpp
+++ b/src/test/beast/beast_io_latency_probe_test.cpp
@@ -23,8 +23,7 @@
 
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/deadline_timer.hpp>
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <algorithm>
 #include <mutex>
@@ -61,10 +60,8 @@ class io_latency_probe_test : public beast::unit_test::suite,
         measure_asio_timers(duration interval = 100ms, size_t num_samples = 50)
         {
             using namespace std::chrono;
-            boost::asio::io_context ios;
-            std::optional<boost::asio::executor_work_guard<
-                boost::asio::io_context::executor_type>>
-                work{boost::asio::make_work_guard(ios)};
+            boost::asio::io_service ios;
+            std::optional<boost::asio::io_service::work> work{ios};
             std::thread worker{[&] { ios.run(); }};
             boost::asio::basic_waitable_timer<Clock> timer{ios};
             elapsed_times_.reserve(num_samples);
@@ -138,7 +135,7 @@ class io_latency_probe_test : public beast::unit_test::suite,
 
         test_sampler(
             std::chrono::milliseconds interval,
-            boost::asio::io_context& ios)
+            boost::asio::io_service& ios)
             : probe_(interval, ios)
         {
         }
@@ -167,9 +164,9 @@ class io_latency_probe_test : public beast::unit_test::suite,
     {
         testcase << "sample one";
         boost::system::error_code ec;
-        test_sampler io_probe{100ms, get_io_context()};
+        test_sampler io_probe{100ms, get_io_service()};
         io_probe.start_one();
-        MyTimer timer{get_io_context(), 1s};
+        MyTimer timer{get_io_service(), 1s};
         timer.async_wait(yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
@@ -201,9 +198,9 @@ class io_latency_probe_test : public beast::unit_test::suite,
                 duration_cast<milliseconds>(probe_duration).count()) /
             static_cast<size_t>(tt.getMean<milliseconds>());
 #endif
-        test_sampler io_probe{interval, get_io_context()};
+        test_sampler io_probe{interval, get_io_service()};
         io_probe.start();
-        MyTimer timer{get_io_context(), probe_duration};
+        MyTimer timer{get_io_service(), probe_duration};
         timer.async_wait(yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
@@ -215,7 +212,7 @@ class io_latency_probe_test : public beast::unit_test::suite,
         io_probe.probe_.cancel_async();
         // wait again in order to flush the remaining
         // probes from the work queue
-        timer.expires_after(1s);
+        timer.expires_from_now(1s);
         timer.async_wait(yield[ec]);
     }
 
@@ -223,7 +220,7 @@ class io_latency_probe_test : public beast::unit_test::suite,
     testCanceled(boost::asio::yield_context& yield)
     {
         testcase << "canceled";
-        test_sampler io_probe{100ms, get_io_context()};
+        test_sampler io_probe{100ms, get_io_service()};
         io_probe.probe_.cancel_async();
         except<std::logic_error>([&io_probe]() { io_probe.start_one(); });
         except<std::logic_error>([&io_probe]() { io_probe.start(); });
diff --git a/src/test/jtx/TrustedPublisherServer.h b/src/test/jtx/TrustedPublisherServer.h
index 26e676c024..7bc092cbe3 100644
--- a/src/test/jtx/TrustedPublisherServer.h
+++ b/src/test/jtx/TrustedPublisherServer.h
@@ -183,7 +183,7 @@ public:
         bool immediateStart = true,
         int sequence = 1)
         : sock_{ioc}
-        , ep_{boost::asio::ip::make_address(
+        , ep_{beast::IP::Address::from_string(
                   ripple::test::getEnvLocalhostAddr()),
               // 0 means let OS pick the port based on what's available
               0}
@@ -284,7 +284,7 @@ public:
         acceptor_.set_option(
             boost::asio::ip::tcp::acceptor::reuse_address(true), ec);
         acceptor_.bind(ep_);
-        acceptor_.listen(boost::asio::socket_base::max_listen_connections);
+        acceptor_.listen(boost::asio::socket_base::max_connections);
         acceptor_.async_accept(
             sock_,
             [wp = std::weak_ptr<TrustedPublisherServer>{shared_from_this()}](
diff --git a/src/test/jtx/impl/JSONRPCClient.cpp b/src/test/jtx/impl/JSONRPCClient.cpp
index a4c5817788..4db13c95fd 100644
--- a/src/test/jtx/impl/JSONRPCClient.cpp
+++ b/src/test/jtx/impl/JSONRPCClient.cpp
@@ -78,7 +78,7 @@ class JSONRPCClient : public AbstractClient
     }
 
     boost::asio::ip::tcp::endpoint ep_;
-    boost::asio::io_context ios_;
+    boost::asio::io_service ios_;
     boost::asio::ip::tcp::socket stream_;
     boost::beast::multi_buffer bin_;
     boost::beast::multi_buffer bout_;
diff --git a/src/test/jtx/impl/WSClient.cpp b/src/test/jtx/impl/WSClient.cpp
index a3dc7d9733..20cca3179a 100644
--- a/src/test/jtx/impl/WSClient.cpp
+++ b/src/test/jtx/impl/WSClient.cpp
@@ -25,9 +25,6 @@
 #include <xrpl/protocol/jss.h>
 #include <xrpl/server/Port.h>
 
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/strand.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/websocket.hpp>
 
@@ -92,11 +89,9 @@ class WSClientImpl : public WSClient
         return s;
     }
 
-    boost::asio::io_context ios_;
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_service ios_;
+    std::optional<boost::asio::io_service::work> work_;
+    boost::asio::io_service::strand strand_;
     std::thread thread_;
     boost::asio::ip::tcp::socket stream_;
     boost::beast::websocket::stream<boost::asio::ip::tcp::socket&> ws_;
@@ -119,24 +114,14 @@ class WSClientImpl : public WSClient
     void
     cleanup()
     {
-        boost::asio::post(
-            ios_, boost::asio::bind_executor(strand_, [this] {
-                if (!peerClosed_)
-                {
-                    ws_.async_close(
-                        {},
-                        boost::asio::bind_executor(strand_, [&](error_code) {
-                            try
-                            {
-                                stream_.cancel();
-                            }
-                            catch (boost::system::system_error const&)
-                            {
-                                // ignored
-                            }
-                        }));
-                }
-            }));
+        ios_.post(strand_.wrap([this] {
+            if (!peerClosed_)
+            {
+                ws_.async_close({}, strand_.wrap([&](error_code ec) {
+                    stream_.cancel(ec);
+                }));
+            }
+        }));
         work_ = std::nullopt;
         thread_.join();
     }
@@ -147,8 +132,8 @@ public:
         bool v2,
         unsigned rpc_version,
         std::unordered_map<std::string, std::string> const& headers = {})
-        : work_(std::in_place, boost::asio::make_work_guard(ios_))
-        , strand_(boost::asio::make_strand(ios_))
+        : work_(ios_)
+        , strand_(ios_)
         , thread_([&] { ios_.run(); })
         , stream_(ios_)
         , ws_(stream_)
@@ -168,12 +153,8 @@ public:
                 "/");
             ws_.async_read(
                 rb_,
-                boost::asio::bind_executor(
-                    strand_,
-                    std::bind(
-                        &WSClientImpl::on_read_msg,
-                        this,
-                        std::placeholders::_1)));
+                strand_.wrap(std::bind(
+                    &WSClientImpl::on_read_msg, this, std::placeholders::_1)));
         }
         catch (std::exception&)
         {
@@ -303,10 +284,8 @@ private:
         }
         ws_.async_read(
             rb_,
-            boost::asio::bind_executor(
-                strand_,
-                std::bind(
-                    &WSClientImpl::on_read_msg, this, std::placeholders::_1)));
+            strand_.wrap(std::bind(
+                &WSClientImpl::on_read_msg, this, std::placeholders::_1)));
     }
 
     // Called when the read op terminates
diff --git a/src/test/overlay/compression_test.cpp b/src/test/overlay/compression_test.cpp
index 4bfbcae4f0..01be43d58b 100644
--- a/src/test/overlay/compression_test.cpp
+++ b/src/test/overlay/compression_test.cpp
@@ -485,7 +485,7 @@ public:
         };
         auto handshake = [&](int outboundEnable, int inboundEnable) {
             beast::IP::Address addr =
-                boost::asio::ip::make_address("172.1.1.100");
+                boost::asio::ip::address::from_string("172.1.1.100");
 
             auto env = getEnv(outboundEnable);
             auto request = ripple::makeRequest(
diff --git a/src/test/overlay/reduce_relay_test.cpp b/src/test/overlay/reduce_relay_test.cpp
index e53f53f2db..0047454cf9 100644
--- a/src/test/overlay/reduce_relay_test.cpp
+++ b/src/test/overlay/reduce_relay_test.cpp
@@ -1655,7 +1655,7 @@ vp_base_squelch_max_selected_peers=2
             };
             auto handshake = [&](int outboundEnable, int inboundEnable) {
                 beast::IP::Address addr =
-                    boost::asio::ip::make_address("172.1.1.100");
+                    boost::asio::ip::address::from_string("172.1.1.100");
 
                 setEnv(outboundEnable);
                 auto request = ripple::makeRequest(
diff --git a/src/test/overlay/short_read_test.cpp b/src/test/overlay/short_read_test.cpp
index 88c6e7698b..739d7ea954 100644
--- a/src/test/overlay/short_read_test.cpp
+++ b/src/test/overlay/short_read_test.cpp
@@ -23,17 +23,12 @@
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/beast/unit_test.h>
 
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/read_until.hpp>
+#include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/asio/streambuf.hpp>
 #include <boost/utility/in_place_factory.hpp>
 
-#include <condition_variable>
 #include <functional>
+#include <optional>
 #include <thread>
 #include <utility>
 
@@ -54,7 +49,7 @@ class short_read_test : public beast::unit_test::suite
 {
 private:
     using io_context_type = boost::asio::io_context;
-    using strand_type = boost::asio::strand<io_context_type::executor_type>;
+    using strand_type = boost::asio::io_context::strand;
     using timer_type =
         boost::asio::basic_waitable_timer<std::chrono::steady_clock>;
     using acceptor_type = boost::asio::ip::tcp::acceptor;
@@ -65,8 +60,7 @@ private:
     using address_type = boost::asio::ip::address;
 
     io_context_type io_context_;
-    boost::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
+    std::optional<boost::asio::executor_work_guard<boost::asio::executor>>
         work_;
     std::thread thread_;
     std::shared_ptr<boost::asio::ssl::context> context_;
@@ -78,7 +72,7 @@ private:
         using boost::asio::buffer;
         using boost::asio::buffer_copy;
         using boost::asio::buffer_size;
-        boost::asio::const_buffer buf(s.data(), s.size());
+        boost::asio::const_buffers_1 buf(s.data(), s.size());
         sb.commit(buffer_copy(sb.prepare(buffer_size(buf)), buf));
     }
 
@@ -191,11 +185,11 @@ private:
                 , acceptor_(
                       test_.io_context_,
                       endpoint_type(
-                          boost::asio::ip::make_address(
+                          beast::IP::Address::from_string(
                               test::getEnvLocalhostAddr()),
                           0))
                 , socket_(test_.io_context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
+                , strand_(test_.io_context_)
             {
                 acceptor_.listen();
                 server_.endpoint_ = acceptor_.local_endpoint();
@@ -271,7 +265,7 @@ private:
                 , test_(server_.test_)
                 , socket_(std::move(socket))
                 , stream_(socket_, *test_.context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
+                , strand_(test_.io_context_)
                 , timer_(test_.io_context_)
             {
             }
@@ -293,7 +287,7 @@ private:
             void
             run()
             {
-                timer_.expires_after(std::chrono::seconds(3));
+                timer_.expires_from_now(std::chrono::seconds(3));
                 timer_.async_wait(bind_executor(
                     strand_,
                     std::bind(
@@ -456,7 +450,7 @@ private:
                 , test_(client_.test_)
                 , socket_(test_.io_context_)
                 , stream_(socket_, *test_.context_)
-                , strand_(boost::asio::make_strand(test_.io_context_))
+                , strand_(test_.io_context_)
                 , timer_(test_.io_context_)
                 , ep_(ep)
             {
@@ -479,7 +473,7 @@ private:
             void
             run(endpoint_type const& ep)
             {
-                timer_.expires_after(std::chrono::seconds(3));
+                timer_.expires_from_now(std::chrono::seconds(3));
                 timer_.async_wait(bind_executor(
                     strand_,
                     std::bind(
diff --git a/src/test/overlay/tx_reduce_relay_test.cpp b/src/test/overlay/tx_reduce_relay_test.cpp
index 83b3013514..aaf650e213 100644
--- a/src/test/overlay/tx_reduce_relay_test.cpp
+++ b/src/test/overlay/tx_reduce_relay_test.cpp
@@ -174,13 +174,13 @@ private:
                   makeFeaturesRequestHeader(false, false, true, false))
             : (void)nDisabled--;
         auto stream_ptr = std::make_unique<stream_type>(
-            socket_type(std::forward<boost::asio::io_context&>(
-                env.app().getIOContext())),
+            socket_type(std::forward<boost::asio::io_service&>(
+                env.app().getIOService())),
             *context_);
         beast::IP::Endpoint local(
-            boost::asio::ip::make_address("172.1.1." + std::to_string(lid_)));
+            beast::IP::Address::from_string("172.1.1." + std::to_string(lid_)));
         beast::IP::Endpoint remote(
-            boost::asio::ip::make_address("172.1.1." + std::to_string(rid_)));
+            beast::IP::Address::from_string("172.1.1." + std::to_string(rid_)));
         PublicKey key(std::get<0>(randomKeyPair(KeyType::ed25519)));
         auto consumer = overlay.resourceManager().newInboundEndpoint(remote);
         auto [slot, _] = overlay.peerFinder().new_inbound_slot(local, remote);
diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp
index bc54c8567c..d139a662de 100644
--- a/src/test/rpc/ValidatorRPC_test.cpp
+++ b/src/test/rpc/ValidatorRPC_test.cpp
@@ -187,14 +187,14 @@ public:
         for (auto const& val : validators)
             expectedKeys.insert(toStr(val.masterPublic));
 
-        // Manage single-thread io_context for server.
+        // Manage single-thread io_service for server.
         BasicApp worker{1};
         using namespace std::chrono_literals;
         NetClock::time_point const validUntil{3600s};
         NetClock::time_point const validFrom2{validUntil - 60s};
         NetClock::time_point const validUntil2{validFrom2 + 3600s};
         auto server = make_TrustedPublisherServer(
-            worker.get_io_context(),
+            worker.get_io_service(),
             validators,
             validUntil,
             {{validFrom2, validUntil2}},
diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp
index 8bbad2cd99..bcd355e301 100644
--- a/src/test/server/ServerStatus_test.cpp
+++ b/src/test/server/ServerStatus_test.cpp
@@ -33,7 +33,6 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
-#include <boost/asio/io_context.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http.hpp>
@@ -166,11 +165,12 @@ class ServerStatus_test : public beast::unit_test::suite,
     {
         using namespace boost::asio;
         using namespace boost::beast::http;
-        io_context& ios = get_io_context();
+        io_service& ios = get_io_service();
         ip::tcp::resolver r{ios};
         boost::beast::multi_buffer sb;
 
-        auto it = r.async_resolve(host, std::to_string(port), yield[ec]);
+        auto it = r.async_resolve(
+            ip::tcp::resolver::query{host, std::to_string(port)}, yield[ec]);
         if (ec)
             return;
 
@@ -476,11 +476,12 @@ class ServerStatus_test : public beast::unit_test::suite,
         auto req_string = boost::lexical_cast<std::string>(req);
         req_string.erase(req_string.find_last_of("13"), std::string::npos);
 
-        io_context& ios = get_io_context();
+        io_service& ios = get_io_service();
         ip::tcp::resolver r{ios};
         boost::beast::multi_buffer sb;
 
-        auto it = r.async_resolve(*ip, std::to_string(*port), yield[ec]);
+        auto it = r.async_resolve(
+            ip::tcp::resolver::query{*ip, std::to_string(*port)}, yield[ec]);
         if (!BEAST_EXPECTS(!ec, ec.message()))
             return;
 
@@ -609,13 +610,14 @@ class ServerStatus_test : public beast::unit_test::suite,
             env.app().config()["port_rpc"].get<std::string>("ip").value();
 
         boost::system::error_code ec;
-        io_context& ios = get_io_context();
+        io_service& ios = get_io_service();
         ip::tcp::resolver r{ios};
 
         Json::Value jr;
         jr[jss::method] = "server_info";
 
-        auto it = r.async_resolve(ip, std::to_string(port), yield[ec]);
+        auto it = r.async_resolve(
+            ip::tcp::resolver::query{ip, std::to_string(port)}, yield[ec]);
         BEAST_EXPECT(!ec);
 
         std::vector<std::pair<ip::tcp::socket, boost::beast::multi_buffer>>
@@ -679,7 +681,7 @@ class ServerStatus_test : public beast::unit_test::suite,
             resp["Upgrade"] == "websocket");
         BEAST_EXPECT(
             resp.find("Connection") != resp.end() &&
-            boost::iequals(resp["Connection"], "upgrade"));
+            resp["Connection"] == "upgrade");
     }
 
     void
@@ -726,10 +728,11 @@ class ServerStatus_test : public beast::unit_test::suite,
             env.app().config()["port_ws"].get<std::string>("ip").value();
         boost::system::error_code ec;
 
-        io_context& ios = get_io_context();
+        io_service& ios = get_io_service();
         ip::tcp::resolver r{ios};
 
-        auto it = r.async_resolve(ip, std::to_string(port), yield[ec]);
+        auto it = r.async_resolve(
+            ip::tcp::resolver::query{ip, std::to_string(port)}, yield[ec]);
         if (!BEAST_EXPECT(!ec))
             return;
 
diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp
index 874558f428..fab271ff1c 100644
--- a/src/test/server/Server_test.cpp
+++ b/src/test/server/Server_test.cpp
@@ -31,7 +31,6 @@
 #include <xrpl/server/Session.h>
 
 #include <boost/asio.hpp>
-#include <boost/asio/executor_work_guard.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/ssl/ssl_stream.hpp>
 #include <boost/utility/in_place_factory.hpp>
@@ -53,16 +52,14 @@ public:
     class TestThread
     {
     private:
-        boost::asio::io_context io_context_;
-        std::optional<boost::asio::executor_work_guard<
-            boost::asio::io_context::executor_type>>
-            work_;
+        boost::asio::io_service io_service_;
+        std::optional<boost::asio::io_service::work> work_;
         std::thread thread_;
 
     public:
         TestThread()
-            : work_(std::in_place, boost::asio::make_work_guard(io_context_))
-            , thread_([&]() { this->io_context_.run(); })
+            : work_(std::in_place, std::ref(io_service_))
+            , thread_([&]() { this->io_service_.run(); })
         {
         }
 
@@ -72,10 +69,10 @@ public:
             thread_.join();
         }
 
-        boost::asio::io_context&
-        get_io_context()
+        boost::asio::io_service&
+        get_io_service()
         {
-            return io_context_;
+            return io_service_;
         }
     };
 
@@ -237,7 +234,7 @@ public:
     void
     test_request(boost::asio::ip::tcp::endpoint const& ep)
     {
-        boost::asio::io_context ios;
+        boost::asio::io_service ios;
         using socket = boost::asio::ip::tcp::socket;
         socket s(ios);
 
@@ -263,7 +260,7 @@ public:
     void
     test_keepalive(boost::asio::ip::tcp::endpoint const& ep)
     {
-        boost::asio::io_context ios;
+        boost::asio::io_service ios;
         using socket = boost::asio::ip::tcp::socket;
         socket s(ios);
 
@@ -303,10 +300,10 @@ public:
         sink.threshold(beast::severities::Severity::kAll);
         beast::Journal journal{sink};
         TestHandler handler;
-        auto s = make_Server(handler, thread.get_io_context(), journal);
+        auto s = make_Server(handler, thread.get_io_service(), journal);
         std::vector<Port> serverPort(1);
         serverPort.back().ip =
-            boost::asio::ip::make_address(getEnvLocalhostAddr()),
+            beast::IP::Address::from_string(getEnvLocalhostAddr()),
         serverPort.back().port = 0;
         serverPort.back().protocol.insert("http");
         auto eps = s->ports(serverPort);
@@ -378,10 +375,10 @@ public:
         for (int i = 0; i < 1000; ++i)
         {
             TestThread thread;
-            auto s = make_Server(h, thread.get_io_context(), journal);
+            auto s = make_Server(h, thread.get_io_service(), journal);
             std::vector<Port> serverPort(1);
             serverPort.back().ip =
-                boost::asio::ip::make_address(getEnvLocalhostAddr()),
+                beast::IP::Address::from_string(getEnvLocalhostAddr()),
             serverPort.back().port = 0;
             serverPort.back().protocol.insert("http");
             s->ports(serverPort);
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
index 774b70e4d1..e81ec6574d 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.cpp
@@ -39,7 +39,7 @@ TimeoutCounter::TimeoutCounter(
     , progress_(false)
     , timerInterval_(interval)
     , queueJobParameter_(std::move(jobParameter))
-    , timer_(app_.getIOContext())
+    , timer_(app_.getIOService())
 {
     XRPL_ASSERT(
         (timerInterval_ > 10ms) && (timerInterval_ < 30s),
diff --git a/src/xrpld/app/ledger/detail/TimeoutCounter.h b/src/xrpld/app/ledger/detail/TimeoutCounter.h
index 8da290dd36..85ce6fc3b4 100644
--- a/src/xrpld/app/ledger/detail/TimeoutCounter.h
+++ b/src/xrpld/app/ledger/detail/TimeoutCounter.h
@@ -120,7 +120,7 @@ protected:
         return complete_ || failed_;
     }
 
-    // Used in this class for access to boost::asio::io_context and
+    // Used in this class for access to boost::asio::io_service and
     // ripple::Overlay. Used in subtypes for the kitchen sink.
     Application& app_;
     beast::Journal journal_;
diff --git a/src/xrpld/app/main/Application.cpp b/src/xrpld/app/main/Application.cpp
index 05b8f5e5fa..fea2579c93 100644
--- a/src/xrpld/app/main/Application.cpp
+++ b/src/xrpld/app/main/Application.cpp
@@ -83,6 +83,7 @@
 #include <limits>
 #include <mutex>
 #include <optional>
+#include <sstream>
 #include <utility>
 
 namespace ripple {
@@ -107,7 +108,7 @@ private:
             beast::insight::Event ev,
             beast::Journal journal,
             std::chrono::milliseconds interval,
-            boost::asio::io_context& ios)
+            boost::asio::io_service& ios)
             : m_event(ev)
             , m_journal(journal)
             , m_probe(interval, ios)
@@ -135,7 +136,7 @@ private:
             if (lastSample >= 500ms)
             {
                 JLOG(m_journal.warn())
-                    << "io_context latency = " << lastSample.count();
+                    << "io_service latency = " << lastSample.count();
             }
         }
 
@@ -404,7 +405,7 @@ public:
               *m_jobQueue,
               *m_ledgerMaster,
               validatorKeys_,
-              get_io_context(),
+              get_io_service(),
               logs_->journal("NetworkOPs"),
               m_collectorManager->collector()))
 
@@ -431,7 +432,7 @@ public:
 
         , serverHandler_(make_ServerHandler(
               *this,
-              get_io_context(),
+              get_io_service(),
               *m_jobQueue,
               *m_networkOPs,
               *m_resourceManager,
@@ -455,22 +456,22 @@ public:
         , txQ_(
               std::make_unique<TxQ>(setup_TxQ(*config_), logs_->journal("TxQ")))
 
-        , sweepTimer_(get_io_context())
+        , sweepTimer_(get_io_service())
 
-        , entropyTimer_(get_io_context())
+        , entropyTimer_(get_io_service())
 
-        , m_signals(get_io_context())
+        , m_signals(get_io_service())
 
         , checkSigs_(true)
 
         , m_resolver(
-              ResolverAsio::New(get_io_context(), logs_->journal("Resolver")))
+              ResolverAsio::New(get_io_service(), logs_->journal("Resolver")))
 
         , m_io_latency_sampler(
               m_collectorManager->collector()->make_event("ios_latency"),
               logs_->journal("Application"),
               std::chrono::milliseconds(100),
-              get_io_context())
+              get_io_service())
         , grpcServer_(std::make_unique<GRPCServer>(*this))
     {
         initAccountIdCache(config_->getValueFor(SizedItem::accountIdCacheSize));
@@ -593,10 +594,10 @@ public:
         return *serverHandler_;
     }
 
-    boost::asio::io_context&
-    getIOContext() override
+    boost::asio::io_service&
+    getIOService() override
     {
-        return get_io_context();
+        return get_io_service();
     }
 
     std::chrono::milliseconds
@@ -934,8 +935,9 @@ public:
                 }))
         {
             using namespace std::chrono;
-            sweepTimer_.expires_after(seconds{config_->SWEEP_INTERVAL.value_or(
-                config_->getValueFor(SizedItem::sweepInterval))});
+            sweepTimer_.expires_from_now(
+                seconds{config_->SWEEP_INTERVAL.value_or(
+                    config_->getValueFor(SizedItem::sweepInterval))});
             sweepTimer_.async_wait(std::move(*optionalCountedHandler));
         }
     }
@@ -964,7 +966,7 @@ public:
                 }))
         {
             using namespace std::chrono_literals;
-            entropyTimer_.expires_after(5min);
+            entropyTimer_.expires_from_now(5min);
             entropyTimer_.async_wait(std::move(*optionalCountedHandler));
         }
     }
@@ -1396,7 +1398,7 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
         *serverHandler_,
         *m_resourceManager,
         *m_resolver,
-        get_io_context(),
+        get_io_service(),
         *config_,
         m_collectorManager->collector());
     add(*overlay_);  // add to PropertyStream
@@ -1569,11 +1571,11 @@ ApplicationImp::run()
     m_io_latency_sampler.cancel_async();
 
     // VFALCO Enormous hack, we have to force the probe to cancel
-    //        before we stop the io_context queue or else it never
+    //        before we stop the io_service queue or else it never
     //        unblocks in its destructor. The fix is to make all
     //        io_objects gracefully handle exit so that we can
-    //        naturally return from io_context::run() instead of
-    //        forcing a call to io_context::stop()
+    //        naturally return from io_service::run() instead of
+    //        forcing a call to io_service::stop()
     m_io_latency_sampler.cancel();
 
     m_resolver->stop_async();
@@ -1584,24 +1586,20 @@ ApplicationImp::run()
     m_resolver->stop();
 
     {
-        try
-        {
-            sweepTimer_.cancel();
-        }
-        catch (boost::system::system_error const& e)
+        boost::system::error_code ec;
+        sweepTimer_.cancel(ec);
+        if (ec)
         {
             JLOG(m_journal.error())
-                << "Application: sweepTimer cancel error: " << e.what();
+                << "Application: sweepTimer cancel error: " << ec.message();
         }
 
-        try
-        {
-            entropyTimer_.cancel();
-        }
-        catch (boost::system::system_error const& e)
+        ec.clear();
+        entropyTimer_.cancel(ec);
+        if (ec)
         {
             JLOG(m_journal.error())
-                << "Application: entropyTimer cancel error: " << e.what();
+                << "Application: entropyTimer cancel error: " << ec.message();
         }
     }
 
diff --git a/src/xrpld/app/main/Application.h b/src/xrpld/app/main/Application.h
index b3a433fee8..36477cb75c 100644
--- a/src/xrpld/app/main/Application.h
+++ b/src/xrpld/app/main/Application.h
@@ -162,8 +162,8 @@ public:
     virtual Config&
     config() = 0;
 
-    virtual boost::asio::io_context&
-    getIOContext() = 0;
+    virtual boost::asio::io_service&
+    getIOService() = 0;
 
     virtual CollectorManager&
     getCollectorManager() = 0;
diff --git a/src/xrpld/app/main/BasicApp.cpp b/src/xrpld/app/main/BasicApp.cpp
index 87f440dfc8..a4b1a74685 100644
--- a/src/xrpld/app/main/BasicApp.cpp
+++ b/src/xrpld/app/main/BasicApp.cpp
@@ -21,11 +21,9 @@
 
 #include <xrpl/beast/core/CurrentThreadName.h>
 
-#include <boost/asio/executor_work_guard.hpp>
-
 BasicApp::BasicApp(std::size_t numberOfThreads)
 {
-    work_.emplace(boost::asio::make_work_guard(io_context_));
+    work_.emplace(io_service_);
     threads_.reserve(numberOfThreads);
 
     while (numberOfThreads--)
@@ -33,7 +31,7 @@ BasicApp::BasicApp(std::size_t numberOfThreads)
         threads_.emplace_back([this, numberOfThreads]() {
             beast::setCurrentThreadName(
                 "io svc #" + std::to_string(numberOfThreads));
-            this->io_context_.run();
+            this->io_service_.run();
         });
     }
 }
diff --git a/src/xrpld/app/main/BasicApp.h b/src/xrpld/app/main/BasicApp.h
index 276676ca18..cd1e8c1a71 100644
--- a/src/xrpld/app/main/BasicApp.h
+++ b/src/xrpld/app/main/BasicApp.h
@@ -20,30 +20,28 @@
 #ifndef RIPPLE_APP_BASICAPP_H_INCLUDED
 #define RIPPLE_APP_BASICAPP_H_INCLUDED
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <optional>
 #include <thread>
 #include <vector>
 
-// This is so that the io_context can outlive all the children
+// This is so that the io_service can outlive all the children
 class BasicApp
 {
 private:
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
+    std::optional<boost::asio::io_service::work> work_;
     std::vector<std::thread> threads_;
-    boost::asio::io_context io_context_;
+    boost::asio::io_service io_service_;
 
 public:
     BasicApp(std::size_t numberOfThreads);
     ~BasicApp();
 
-    boost::asio::io_context&
-    get_io_context()
+    boost::asio::io_service&
+    get_io_service()
     {
-        return io_context_;
+        return io_service_;
     }
 };
 
diff --git a/src/xrpld/app/main/Main.cpp b/src/xrpld/app/main/Main.cpp
index 2353d7acd1..3fdf362dd9 100644
--- a/src/xrpld/app/main/Main.cpp
+++ b/src/xrpld/app/main/Main.cpp
@@ -28,17 +28,12 @@
 #include <xrpl/beast/core/CurrentThreadName.h>
 #include <xrpl/protocol/BuildInfo.h>
 
-#include <boost/asio/io_context.hpp>
-#include <boost/process/v1/args.hpp>
-#include <boost/process/v1/child.hpp>
-#include <boost/process/v1/exe.hpp>
-
 #ifdef ENABLE_TESTS
 #include <test/unit_test/multi_runner.h>
 
 #include <xrpl/beast/unit_test/match.h>
 #endif  // ENABLE_TESTS
-#include <boost/algorithm/string.hpp>
+#include <boost/process.hpp>
 #include <boost/program_options.hpp>
 
 #include <google/protobuf/stubs/common.h>
@@ -288,7 +283,7 @@ runUnitTests(
     if (!child)
     {
         multi_runner_parent parent_runner;
-        std::vector<boost::process::v1::child> children;
+        std::vector<boost::process::child> children;
 
         std::string const exe_name = argv[0];
         std::vector<std::string> args;
@@ -301,8 +296,7 @@ runUnitTests(
 
         for (std::size_t i = 0; i < num_jobs; ++i)
             children.emplace_back(
-                boost::process::v1::exe = exe_name,
-                boost::process::v1::args = args);
+                boost::process::exe = exe_name, boost::process::args = args);
 
         int bad_child_exits = 0;
         int terminated_child_exits = 0;
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index b9069442f8..347bbb5307 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -233,7 +233,7 @@ public:
         JobQueue& job_queue,
         LedgerMaster& ledgerMaster,
         ValidatorKeys const& validatorKeys,
-        boost::asio::io_context& io_svc,
+        boost::asio::io_service& io_svc,
         beast::Journal journal,
         beast::insight::Collector::ptr const& collector)
         : app_(app)
@@ -588,35 +588,31 @@ public:
     stop() override
     {
         {
-            try
-            {
-                heartbeatTimer_.cancel();
-            }
-            catch (boost::system::system_error const& e)
+            boost::system::error_code ec;
+            heartbeatTimer_.cancel(ec);
+            if (ec)
             {
                 JLOG(m_journal.error())
-                    << "NetworkOPs: heartbeatTimer cancel error: " << e.what();
+                    << "NetworkOPs: heartbeatTimer cancel error: "
+                    << ec.message();
             }
 
-            try
-            {
-                clusterTimer_.cancel();
-            }
-            catch (boost::system::system_error const& e)
+            ec.clear();
+            clusterTimer_.cancel(ec);
+            if (ec)
             {
                 JLOG(m_journal.error())
-                    << "NetworkOPs: clusterTimer cancel error: " << e.what();
+                    << "NetworkOPs: clusterTimer cancel error: "
+                    << ec.message();
             }
 
-            try
-            {
-                accountHistoryTxTimer_.cancel();
-            }
-            catch (boost::system::system_error const& e)
+            ec.clear();
+            accountHistoryTxTimer_.cancel(ec);
+            if (ec)
             {
                 JLOG(m_journal.error())
                     << "NetworkOPs: accountHistoryTxTimer cancel error: "
-                    << e.what();
+                    << ec.message();
             }
         }
         // Make sure that any waitHandlers pending in our timers are done.
@@ -988,7 +984,7 @@ NetworkOPsImp::setTimer(
                 }
             }))
     {
-        timer.expires_after(expiry_time);
+        timer.expires_from_now(expiry_time);
         timer.async_wait(std::move(*optionalCountedHandler));
     }
 }
@@ -4864,7 +4860,7 @@ make_NetworkOPs(
     JobQueue& job_queue,
     LedgerMaster& ledgerMaster,
     ValidatorKeys const& validatorKeys,
-    boost::asio::io_context& io_svc,
+    boost::asio::io_service& io_svc,
     beast::Journal journal,
     beast::insight::Collector::ptr const& collector)
 {
diff --git a/src/xrpld/app/misc/NetworkOPs.h b/src/xrpld/app/misc/NetworkOPs.h
index bec0ad2341..6ea0ea108b 100644
--- a/src/xrpld/app/misc/NetworkOPs.h
+++ b/src/xrpld/app/misc/NetworkOPs.h
@@ -290,7 +290,7 @@ make_NetworkOPs(
     JobQueue& job_queue,
     LedgerMaster& ledgerMaster,
     ValidatorKeys const& validatorKeys,
-    boost::asio::io_context& io_svc,
+    boost::asio::io_service& io_svc,
     beast::Journal journal,
     beast::insight::Collector::ptr const& collector);
 
diff --git a/src/xrpld/app/misc/detail/ValidatorSite.cpp b/src/xrpld/app/misc/detail/ValidatorSite.cpp
index e235ff3e66..42d4e9e271 100644
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -91,7 +91,7 @@ ValidatorSite::ValidatorSite(
     std::chrono::seconds timeout)
     : app_{app}
     , j_{j ? *j : app_.logs().journal("ValidatorSite")}
-    , timer_{app_.getIOContext()}
+    , timer_{app_.getIOService()}
     , fetching_{false}
     , pending_{false}
     , stopping_{false}
@@ -271,7 +271,7 @@ ValidatorSite::makeRequest(
             resource->pUrl.domain,
             resource->pUrl.path,
             std::to_string(*resource->pUrl.port),
-            app_.getIOContext(),
+            app_.getIOService(),
             j_,
             app_.config(),
             sites_[siteIdx].lastRequestEndpoint,
@@ -284,7 +284,7 @@ ValidatorSite::makeRequest(
             resource->pUrl.domain,
             resource->pUrl.path,
             std::to_string(*resource->pUrl.port),
-            app_.getIOContext(),
+            app_.getIOService(),
             sites_[siteIdx].lastRequestEndpoint,
             sites_[siteIdx].lastRequestSuccessful,
             onFetch);
@@ -293,7 +293,7 @@ ValidatorSite::makeRequest(
     {
         BOOST_ASSERT(resource->pUrl.scheme == "file");
         sp = std::make_shared<detail::WorkFile>(
-            resource->pUrl.path, app_.getIOContext(), onFetchFile);
+            resource->pUrl.path, app_.getIOService(), onFetchFile);
     }
 
     sites_[siteIdx].lastRequestSuccessful = false;
diff --git a/src/xrpld/app/misc/detail/WorkBase.h b/src/xrpld/app/misc/detail/WorkBase.h
index a73cd3d597..17f935126b 100644
--- a/src/xrpld/app/misc/detail/WorkBase.h
+++ b/src/xrpld/app/misc/detail/WorkBase.h
@@ -26,7 +26,6 @@
 #include <xrpl/protocol/BuildInfo.h>
 
 #include <boost/asio.hpp>
-#include <boost/asio/strand.hpp>
 #include <boost/beast/core/multi_buffer.hpp>
 #include <boost/beast/http/empty_body.hpp>
 #include <boost/beast/http/read.hpp>
@@ -58,8 +57,8 @@ protected:
     std::string path_;
     std::string port_;
     callback_type cb_;
-    boost::asio::io_context& ios_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_service& ios_;
+    boost::asio::io_service::strand strand_;
     resolver_type resolver_;
     socket_type socket_;
     request_type req_;
@@ -73,7 +72,7 @@ public:
         std::string const& host,
         std::string const& path,
         std::string const& port,
-        boost::asio::io_context& ios,
+        boost::asio::io_service& ios,
         endpoint_type const& lastEndpoint,
         bool lastStatus,
         callback_type cb);
@@ -121,7 +120,7 @@ WorkBase<Impl>::WorkBase(
     std::string const& host,
     std::string const& path,
     std::string const& port,
-    boost::asio::io_context& ios,
+    boost::asio::io_service& ios,
     endpoint_type const& lastEndpoint,
     bool lastStatus,
     callback_type cb)
@@ -130,7 +129,7 @@ WorkBase<Impl>::WorkBase(
     , port_(port)
     , cb_(std::move(cb))
     , ios_(ios)
-    , strand_(boost::asio::make_strand(ios))
+    , strand_(ios)
     , resolver_(ios)
     , socket_(ios)
     , lastEndpoint_{lastEndpoint}
@@ -153,21 +152,17 @@ void
 WorkBase<Impl>::run()
 {
     if (!strand_.running_in_this_thread())
-        return boost::asio::post(
-            ios_,
-            boost::asio::bind_executor(
-                strand_, std::bind(&WorkBase::run, impl().shared_from_this())));
+        return ios_.post(
+            strand_.wrap(std::bind(&WorkBase::run, impl().shared_from_this())));
 
     resolver_.async_resolve(
         host_,
         port_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &WorkBase::onResolve,
-                impl().shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+        strand_.wrap(std::bind(
+            &WorkBase::onResolve,
+            impl().shared_from_this(),
+            std::placeholders::_1,
+            std::placeholders::_2)));
 }
 
 template <class Impl>
@@ -176,12 +171,8 @@ WorkBase<Impl>::cancel()
 {
     if (!strand_.running_in_this_thread())
     {
-        return boost::asio::post(
-            ios_,
-
-            boost::asio::bind_executor(
-                strand_,
-                std::bind(&WorkBase::cancel, impl().shared_from_this())));
+        return ios_.post(strand_.wrap(
+            std::bind(&WorkBase::cancel, impl().shared_from_this())));
     }
 
     error_code ec;
@@ -210,13 +201,11 @@ WorkBase<Impl>::onResolve(error_code const& ec, results_type results)
     boost::asio::async_connect(
         socket_,
         results,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &WorkBase::onConnect,
-                impl().shared_from_this(),
-                std::placeholders::_1,
-                std::placeholders::_2)));
+        strand_.wrap(std::bind(
+            &WorkBase::onConnect,
+            impl().shared_from_this(),
+            std::placeholders::_1,
+            std::placeholders::_2)));
 }
 
 template <class Impl>
@@ -244,12 +233,10 @@ WorkBase<Impl>::onStart()
     boost::beast::http::async_write(
         impl().stream(),
         req_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &WorkBase::onRequest,
-                impl().shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &WorkBase::onRequest,
+            impl().shared_from_this(),
+            std::placeholders::_1)));
 }
 
 template <class Impl>
@@ -263,12 +250,10 @@ WorkBase<Impl>::onRequest(error_code const& ec)
         impl().stream(),
         readBuf_,
         res_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &WorkBase::onResponse,
-                impl().shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &WorkBase::onResponse,
+            impl().shared_from_this(),
+            std::placeholders::_1)));
 }
 
 template <class Impl>
diff --git a/src/xrpld/app/misc/detail/WorkFile.h b/src/xrpld/app/misc/detail/WorkFile.h
index 562e1c9ec1..51fd6db78c 100644
--- a/src/xrpld/app/misc/detail/WorkFile.h
+++ b/src/xrpld/app/misc/detail/WorkFile.h
@@ -26,10 +26,6 @@
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/utility/instrumentation.h>
 
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/strand.hpp>
-
 namespace ripple {
 
 namespace detail {
@@ -49,7 +45,7 @@ public:
 public:
     WorkFile(
         std::string const& path,
-        boost::asio::io_context& ios,
+        boost::asio::io_service& ios,
         callback_type cb);
     ~WorkFile();
 
@@ -62,20 +58,17 @@ public:
 private:
     std::string path_;
     callback_type cb_;
-    boost::asio::io_context& ios_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_service& ios_;
+    boost::asio::io_service::strand strand_;
 };
 
 //------------------------------------------------------------------------------
 
 WorkFile::WorkFile(
     std::string const& path,
-    boost::asio::io_context& ios,
+    boost::asio::io_service& ios,
     callback_type cb)
-    : path_(path)
-    , cb_(std::move(cb))
-    , ios_(ios)
-    , strand_(boost::asio::make_strand(ios))
+    : path_(path), cb_(std::move(cb)), ios_(ios), strand_(ios)
 {
 }
 
@@ -89,10 +82,8 @@ void
 WorkFile::run()
 {
     if (!strand_.running_in_this_thread())
-        return boost::asio::post(
-            ios_,
-            boost::asio::bind_executor(
-                strand_, std::bind(&WorkFile::run, shared_from_this())));
+        return ios_.post(
+            strand_.wrap(std::bind(&WorkFile::run, shared_from_this())));
 
     error_code ec;
     auto const fileContents = getFileContents(ec, path_, megabytes(1));
diff --git a/src/xrpld/app/misc/detail/WorkPlain.h b/src/xrpld/app/misc/detail/WorkPlain.h
index 38dd0df9fa..16bf424131 100644
--- a/src/xrpld/app/misc/detail/WorkPlain.h
+++ b/src/xrpld/app/misc/detail/WorkPlain.h
@@ -37,7 +37,7 @@ public:
         std::string const& host,
         std::string const& path,
         std::string const& port,
-        boost::asio::io_context& ios,
+        boost::asio::io_service& ios,
         endpoint_type const& lastEndpoint,
         bool lastStatus,
         callback_type cb);
@@ -60,7 +60,7 @@ WorkPlain::WorkPlain(
     std::string const& host,
     std::string const& path,
     std::string const& port,
-    boost::asio::io_context& ios,
+    boost::asio::io_service& ios,
     endpoint_type const& lastEndpoint,
     bool lastStatus,
     callback_type cb)
diff --git a/src/xrpld/app/misc/detail/WorkSSL.cpp b/src/xrpld/app/misc/detail/WorkSSL.cpp
index a262a66ca7..0d6801ab84 100644
--- a/src/xrpld/app/misc/detail/WorkSSL.cpp
+++ b/src/xrpld/app/misc/detail/WorkSSL.cpp
@@ -26,7 +26,7 @@ WorkSSL::WorkSSL(
     std::string const& host,
     std::string const& path,
     std::string const& port,
-    boost::asio::io_context& ios,
+    boost::asio::io_service& ios,
     beast::Journal j,
     Config const& config,
     endpoint_type const& lastEndpoint,
@@ -56,12 +56,8 @@ WorkSSL::onConnect(error_code const& ec)
 
     stream_.async_handshake(
         boost::asio::ssl::stream_base::client,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &WorkSSL::onHandshake,
-                shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &WorkSSL::onHandshake, shared_from_this(), std::placeholders::_1)));
 }
 
 void
diff --git a/src/xrpld/app/misc/detail/WorkSSL.h b/src/xrpld/app/misc/detail/WorkSSL.h
index cadc3fd8fd..6a310986e7 100644
--- a/src/xrpld/app/misc/detail/WorkSSL.h
+++ b/src/xrpld/app/misc/detail/WorkSSL.h
@@ -52,7 +52,7 @@ public:
         std::string const& host,
         std::string const& path,
         std::string const& port,
-        boost::asio::io_context& ios,
+        boost::asio::io_service& ios,
         beast::Journal j,
         Config const& config,
         endpoint_type const& lastEndpoint,
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.cpp b/src/xrpld/overlay/detail/ConnectAttempt.cpp
index 397ac06ba6..61049579c5 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.cpp
+++ b/src/xrpld/overlay/detail/ConnectAttempt.cpp
@@ -28,7 +28,7 @@ namespace ripple {
 
 ConnectAttempt::ConnectAttempt(
     Application& app,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     endpoint_type const& remote_endpoint,
     Resource::Consumer usage,
     shared_context const& context,
@@ -43,10 +43,10 @@ ConnectAttempt::ConnectAttempt(
     , journal_(sink_)
     , remote_endpoint_(remote_endpoint)
     , usage_(usage)
-    , strand_(boost::asio::make_strand(io_context))
-    , timer_(io_context)
+    , strand_(io_service)
+    , timer_(io_service)
     , stream_ptr_(std::make_unique<stream_type>(
-          socket_type(std::forward<boost::asio::io_context&>(io_context)),
+          socket_type(std::forward<boost::asio::io_service&>(io_service)),
           *context))
     , socket_(stream_ptr_->next_layer().socket())
     , stream_(*stream_ptr_)
@@ -66,8 +66,8 @@ void
 ConnectAttempt::stop()
 {
     if (!strand_.running_in_this_thread())
-        return boost::asio::post(
-            strand_, std::bind(&ConnectAttempt::stop, shared_from_this()));
+        return strand_.post(
+            std::bind(&ConnectAttempt::stop, shared_from_this()));
     if (socket_.is_open())
     {
         JLOG(journal_.debug()) << "Stop";
@@ -80,12 +80,10 @@ ConnectAttempt::run()
 {
     stream_.next_layer().async_connect(
         remote_endpoint_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &ConnectAttempt::onConnect,
-                shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &ConnectAttempt::onConnect,
+            shared_from_this(),
+            std::placeholders::_1)));
 }
 
 //------------------------------------------------------------------------------
@@ -98,16 +96,9 @@ ConnectAttempt::close()
         "ripple::ConnectAttempt::close : strand in this thread");
     if (socket_.is_open())
     {
-        try
-        {
-            timer_.cancel();
-            socket_.close();
-        }
-        catch (boost::system::system_error const&)
-        {
-            // ignored
-        }
-
+        error_code ec;
+        timer_.cancel(ec);
+        socket_.close(ec);
         JLOG(journal_.debug()) << "Closed";
     }
 }
@@ -129,35 +120,23 @@ ConnectAttempt::fail(std::string const& name, error_code ec)
 void
 ConnectAttempt::setTimer()
 {
-    try
+    error_code ec;
+    timer_.expires_from_now(std::chrono::seconds(15), ec);
+    if (ec)
     {
-        timer_.expires_after(std::chrono::seconds(15));
-    }
-    catch (boost::system::system_error const& e)
-    {
-        JLOG(journal_.error()) << "setTimer: " << e.code();
+        JLOG(journal_.error()) << "setTimer: " << ec.message();
         return;
     }
 
-    timer_.async_wait(boost::asio::bind_executor(
-        strand_,
-        std::bind(
-            &ConnectAttempt::onTimer,
-            shared_from_this(),
-            std::placeholders::_1)));
+    timer_.async_wait(strand_.wrap(std::bind(
+        &ConnectAttempt::onTimer, shared_from_this(), std::placeholders::_1)));
 }
 
 void
 ConnectAttempt::cancelTimer()
 {
-    try
-    {
-        timer_.cancel();
-    }
-    catch (boost::system::system_error const&)
-    {
-        // ignored
-    }
+    error_code ec;
+    timer_.cancel(ec);
 }
 
 void
@@ -196,12 +175,10 @@ ConnectAttempt::onConnect(error_code ec)
     stream_.set_verify_mode(boost::asio::ssl::verify_none);
     stream_.async_handshake(
         boost::asio::ssl::stream_base::client,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &ConnectAttempt::onHandshake,
-                shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &ConnectAttempt::onHandshake,
+            shared_from_this(),
+            std::placeholders::_1)));
 }
 
 void
@@ -246,12 +223,10 @@ ConnectAttempt::onHandshake(error_code ec)
     boost::beast::http::async_write(
         stream_,
         req_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &ConnectAttempt::onWrite,
-                shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &ConnectAttempt::onWrite,
+            shared_from_this(),
+            std::placeholders::_1)));
 }
 
 void
@@ -268,12 +243,10 @@ ConnectAttempt::onWrite(error_code ec)
         stream_,
         read_buf_,
         response_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &ConnectAttempt::onRead,
-                shared_from_this(),
-                std::placeholders::_1)));
+        strand_.wrap(std::bind(
+            &ConnectAttempt::onRead,
+            shared_from_this(),
+            std::placeholders::_1)));
 }
 
 void
@@ -289,12 +262,10 @@ ConnectAttempt::onRead(error_code ec)
     {
         JLOG(journal_.info()) << "EOF";
         setTimer();
-        return stream_.async_shutdown(boost::asio::bind_executor(
-            strand_,
-            std::bind(
-                &ConnectAttempt::onShutdown,
-                shared_from_this(),
-                std::placeholders::_1)));
+        return stream_.async_shutdown(strand_.wrap(std::bind(
+            &ConnectAttempt::onShutdown,
+            shared_from_this(),
+            std::placeholders::_1)));
     }
     if (ec)
         return fail("onRead", ec);
@@ -328,7 +299,7 @@ ConnectAttempt::processResponse()
         s.reserve(boost::asio::buffer_size(response_.body().data()));
         for (auto const buffer : response_.body().data())
             s.append(
-                static_cast<char const*>(buffer.data()),
+                boost::asio::buffer_cast<char const*>(buffer),
                 boost::asio::buffer_size(buffer));
         auto const success = r.parse(s, json);
         if (success)
diff --git a/src/xrpld/overlay/detail/ConnectAttempt.h b/src/xrpld/overlay/detail/ConnectAttempt.h
index febbe88f45..c3e07f956a 100644
--- a/src/xrpld/overlay/detail/ConnectAttempt.h
+++ b/src/xrpld/overlay/detail/ConnectAttempt.h
@@ -50,7 +50,7 @@ private:
     beast::Journal const journal_;
     endpoint_type remote_endpoint_;
     Resource::Consumer usage_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_service::strand strand_;
     boost::asio::basic_waitable_timer<std::chrono::steady_clock> timer_;
     std::unique_ptr<stream_type> stream_ptr_;
     socket_type& socket_;
@@ -63,7 +63,7 @@ private:
 public:
     ConnectAttempt(
         Application& app,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         endpoint_type const& remote_endpoint,
         Resource::Consumer usage,
         shared_context const& context,
diff --git a/src/xrpld/overlay/detail/Handshake.cpp b/src/xrpld/overlay/detail/Handshake.cpp
index 5ce4954a5e..e3617a1d98 100644
--- a/src/xrpld/overlay/detail/Handshake.cpp
+++ b/src/xrpld/overlay/detail/Handshake.cpp
@@ -326,7 +326,7 @@ verifyHandshake(
     {
         boost::system::error_code ec;
         auto const local_ip =
-            boost::asio::ip::make_address(std::string_view(iter->value()), ec);
+            boost::asio::ip::address::from_string(iter->value(), ec);
 
         if (ec)
             throw std::runtime_error("Invalid Local-IP");
@@ -341,7 +341,7 @@ verifyHandshake(
     {
         boost::system::error_code ec;
         auto const remote_ip =
-            boost::asio::ip::make_address(std::string_view(iter->value()), ec);
+            boost::asio::ip::address::from_string(iter->value(), ec);
 
         if (ec)
             throw std::runtime_error("Invalid Remote-IP");
diff --git a/src/xrpld/overlay/detail/OverlayImpl.cpp b/src/xrpld/overlay/detail/OverlayImpl.cpp
index 8d295faace..ccc9da3d3c 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.cpp
+++ b/src/xrpld/overlay/detail/OverlayImpl.cpp
@@ -41,7 +41,6 @@
 #include <xrpl/server/SimpleWriter.h>
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/asio/executor_work_guard.hpp>
 
 namespace ripple {
 
@@ -69,7 +68,7 @@ OverlayImpl::Child::~Child()
 //------------------------------------------------------------------------------
 
 OverlayImpl::Timer::Timer(OverlayImpl& overlay)
-    : Child(overlay), timer_(overlay_.io_context_)
+    : Child(overlay), timer_(overlay_.io_service_)
 {
 }
 
@@ -86,10 +85,8 @@ void
 OverlayImpl::Timer::async_wait()
 {
     timer_.expires_after(std::chrono::seconds(1));
-    timer_.async_wait(boost::asio::bind_executor(
-        overlay_.strand_,
-        std::bind(
-            &Timer::on_timer, shared_from_this(), std::placeholders::_1)));
+    timer_.async_wait(overlay_.strand_.wrap(std::bind(
+        &Timer::on_timer, shared_from_this(), std::placeholders::_1)));
 }
 
 void
@@ -124,19 +121,19 @@ OverlayImpl::OverlayImpl(
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
     : app_(app)
-    , io_context_(io_context)
-    , work_(std::in_place, boost::asio::make_work_guard(io_context_))
-    , strand_(boost::asio::make_strand(io_context_))
+    , io_service_(io_service)
+    , work_(std::in_place, std::ref(io_service_))
+    , strand_(io_service_)
     , setup_(setup)
     , journal_(app_.journal("Overlay"))
     , serverHandler_(serverHandler)
     , m_resourceManager(resourceManager)
     , m_peerFinder(PeerFinder::make_Manager(
-          io_context,
+          io_service,
           stopwatch(),
           app_.journal("PeerFinder"),
           config,
@@ -414,7 +411,7 @@ OverlayImpl::connect(beast::IP::Endpoint const& remote_endpoint)
 
     auto const p = std::make_shared<ConnectAttempt>(
         app_,
-        io_context_,
+        io_service_,
         beast::IPAddressConversion::to_asio_endpoint(remote_endpoint),
         usage,
         setup_.context,
@@ -566,7 +563,7 @@ OverlayImpl::start()
 void
 OverlayImpl::stop()
 {
-    boost::asio::dispatch(strand_, std::bind(&OverlayImpl::stopChildren, this));
+    strand_.dispatch(std::bind(&OverlayImpl::stopChildren, this));
     {
         std::unique_lock<decltype(mutex_)> lock(mutex_);
         cond_.wait(lock, [this] { return list_.empty(); });
@@ -1504,7 +1501,7 @@ setup_Overlay(BasicConfig const& config)
         if (!ip.empty())
         {
             boost::system::error_code ec;
-            setup.public_ip = boost::asio::ip::make_address(ip, ec);
+            setup.public_ip = beast::IP::Address::from_string(ip, ec);
             if (ec || beast::IP::is_private(setup.public_ip))
                 Throw<std::runtime_error>("Configured public IP is invalid");
         }
@@ -1598,7 +1595,7 @@ make_Overlay(
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
 {
@@ -1608,7 +1605,7 @@ make_Overlay(
         serverHandler,
         resourceManager,
         resolver,
-        io_context,
+        io_service,
         config,
         collector);
 }
diff --git a/src/xrpld/overlay/detail/OverlayImpl.h b/src/xrpld/overlay/detail/OverlayImpl.h
index b4ea3307ec..86107fc591 100644
--- a/src/xrpld/overlay/detail/OverlayImpl.h
+++ b/src/xrpld/overlay/detail/OverlayImpl.h
@@ -38,7 +38,6 @@
 #include <xrpl/resource/ResourceManager.h>
 #include <xrpl/server/Handoff.h>
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ssl/context.hpp>
@@ -101,11 +100,9 @@ private:
     };
 
     Application& app_;
-    boost::asio::io_context& io_context_;
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
-    boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+    boost::asio::io_service& io_service_;
+    std::optional<boost::asio::io_service::work> work_;
+    boost::asio::io_service::strand strand_;
     mutable std::recursive_mutex mutex_;  // VFALCO use std::mutex
     std::condition_variable_any cond_;
     std::weak_ptr<Timer> timer_;
@@ -146,7 +143,7 @@ public:
         ServerHandler& serverHandler,
         Resource::Manager& resourceManager,
         Resolver& resolver,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         BasicConfig const& config,
         beast::insight::Collector::ptr const& collector);
 
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 2cd9432eb8..3b75383ad4 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -84,7 +84,7 @@ PeerImp::PeerImp(
     , stream_ptr_(std::move(stream_ptr))
     , socket_(stream_ptr_->next_layer().socket())
     , stream_(*stream_ptr_)
-    , strand_(boost::asio::make_strand(socket_.get_executor()))
+    , strand_(socket_.get_executor())
     , timer_(waitable_timer{socket_.get_executor()})
     , remote_address_(slot->remote_endpoint())
     , overlay_(overlay)
@@ -581,16 +581,9 @@ PeerImp::close()
     if (socket_.is_open())
     {
         detaching_ = true;  // DEPRECATED
-        try
-        {
-            timer_.cancel();
-            socket_.close();
-        }
-        catch (boost::system::system_error const&)
-        {
-            // ignored
-        }
-
+        error_code ec;
+        timer_.cancel(ec);
+        socket_.close(ec);
         overlay_.incPeerDisconnect();
         if (inbound_)
         {
@@ -661,13 +654,12 @@ PeerImp::gracefulClose()
 void
 PeerImp::setTimer()
 {
-    try
+    error_code ec;
+    timer_.expires_from_now(peerTimerInterval, ec);
+
+    if (ec)
     {
-        timer_.expires_after(peerTimerInterval);
-    }
-    catch (boost::system::system_error const& e)
-    {
-        JLOG(journal_.error()) << "setTimer: " << e.code();
+        JLOG(journal_.error()) << "setTimer: " << ec.message();
         return;
     }
     timer_.async_wait(bind_executor(
@@ -680,14 +672,8 @@ PeerImp::setTimer()
 void
 PeerImp::cancelTimer()
 {
-    try
-    {
-        timer_.cancel();
-    }
-    catch (boost::system::system_error const&)
-    {
-        // ignored
-    }
+    error_code ec;
+    timer_.cancel(ec);
 }
 
 //------------------------------------------------------------------------------
diff --git a/src/xrpld/overlay/detail/PeerImp.h b/src/xrpld/overlay/detail/PeerImp.h
index 3d9a0c0b1e..5aa49fd152 100644
--- a/src/xrpld/overlay/detail/PeerImp.h
+++ b/src/xrpld/overlay/detail/PeerImp.h
@@ -669,7 +669,7 @@ PeerImp::PeerImp(
     , stream_ptr_(std::move(stream_ptr))
     , socket_(stream_ptr_->next_layer().socket())
     , stream_(*stream_ptr_)
-    , strand_(boost::asio::make_strand(socket_.get_executor()))
+    , strand_(socket_.get_executor())
     , timer_(waitable_timer{socket_.get_executor()})
     , remote_address_(slot->remote_endpoint())
     , overlay_(overlay)
diff --git a/src/xrpld/overlay/detail/PeerSet.cpp b/src/xrpld/overlay/detail/PeerSet.cpp
index 74290f50d3..611728839c 100644
--- a/src/xrpld/overlay/detail/PeerSet.cpp
+++ b/src/xrpld/overlay/detail/PeerSet.cpp
@@ -46,7 +46,7 @@ public:
     getPeerIds() const override;
 
 private:
-    // Used in this class for access to boost::asio::io_context and
+    // Used in this class for access to boost::asio::io_service and
     // ripple::Overlay.
     Application& app_;
     beast::Journal journal_;
diff --git a/src/xrpld/overlay/detail/ZeroCopyStream.h b/src/xrpld/overlay/detail/ZeroCopyStream.h
index 23e26c5351..87a5e10bc2 100644
--- a/src/xrpld/overlay/detail/ZeroCopyStream.h
+++ b/src/xrpld/overlay/detail/ZeroCopyStream.h
@@ -78,7 +78,7 @@ template <class Buffers>
 bool
 ZeroCopyInputStream<Buffers>::Next(void const** data, int* size)
 {
-    *data = pos_.data();
+    *data = boost::asio::buffer_cast<void const*>(pos_);
     *size = boost::asio::buffer_size(pos_);
     if (first_ == last_)
         return false;
@@ -195,7 +195,7 @@ ZeroCopyOutputStream<Streambuf>::Next(void** data, int* size)
         pos_ = buffers_.begin();
     }
 
-    *data = *pos_.data();
+    *data = boost::asio::buffer_cast<void*>(*pos_);
     *size = boost::asio::buffer_size(*pos_);
     commit_ = *size;
     ++pos_;
diff --git a/src/xrpld/overlay/make_Overlay.h b/src/xrpld/overlay/make_Overlay.h
index 142c922551..3476026562 100644
--- a/src/xrpld/overlay/make_Overlay.h
+++ b/src/xrpld/overlay/make_Overlay.h
@@ -25,7 +25,7 @@
 
 #include <xrpl/basics/Resolver.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 namespace ripple {
 
@@ -40,7 +40,7 @@ make_Overlay(
     ServerHandler& serverHandler,
     Resource::Manager& resourceManager,
     Resolver& resolver,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector);
 
diff --git a/src/xrpld/peerfinder/detail/Checker.h b/src/xrpld/peerfinder/detail/Checker.h
index c5221fcc13..e7983471a5 100644
--- a/src/xrpld/peerfinder/detail/Checker.h
+++ b/src/xrpld/peerfinder/detail/Checker.h
@@ -22,7 +22,7 @@
 
 #include <xrpl/beast/net/IPAddressConversion.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/intrusive/list.hpp>
 
@@ -65,7 +65,7 @@ private:
 
         async_op(
             Checker& owner,
-            boost::asio::io_context& io_context,
+            boost::asio::io_service& io_service,
             Handler&& handler);
 
         ~async_op();
@@ -85,17 +85,17 @@ private:
 
     std::mutex mutex_;
     std::condition_variable cond_;
-    boost::asio::io_context& io_context_;
+    boost::asio::io_service& io_service_;
     list_type list_;
     bool stop_ = false;
 
 public:
-    explicit Checker(boost::asio::io_context& io_context);
+    explicit Checker(boost::asio::io_service& io_service);
 
     /** Destroy the service.
         Any pending I/O operations will be canceled. This call blocks until
         all pending operations complete (either with success or with
-        operation_aborted) and the associated thread and io_context have
+        operation_aborted) and the associated thread and io_service have
         no more work remaining.
     */
     ~Checker();
@@ -132,10 +132,10 @@ template <class Protocol>
 template <class Handler>
 Checker<Protocol>::async_op<Handler>::async_op(
     Checker& owner,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     Handler&& handler)
     : checker_(owner)
-    , socket_(io_context)
+    , socket_(io_service)
     , handler_(std::forward<Handler>(handler))
 {
 }
@@ -167,8 +167,8 @@ Checker<Protocol>::async_op<Handler>::operator()(error_code const& ec)
 //------------------------------------------------------------------------------
 
 template <class Protocol>
-Checker<Protocol>::Checker(boost::asio::io_context& io_context)
-    : io_context_(io_context)
+Checker<Protocol>::Checker(boost::asio::io_service& io_service)
+    : io_service_(io_service)
 {
 }
 
@@ -208,7 +208,7 @@ Checker<Protocol>::async_connect(
     Handler&& handler)
 {
     auto const op = std::make_shared<async_op<Handler>>(
-        *this, io_context_, std::forward<Handler>(handler));
+        *this, io_service_, std::forward<Handler>(handler));
     {
         std::lock_guard lock(mutex_);
         list_.push_back(*op);
diff --git a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
index 462820cca2..e7d16c61d1 100644
--- a/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
+++ b/src/xrpld/peerfinder/detail/PeerfinderManager.cpp
@@ -23,8 +23,7 @@
 #include <xrpld/peerfinder/detail/SourceStrings.h>
 #include <xrpld/peerfinder/detail/StoreSqdb.h>
 
-#include <boost/asio/executor_work_guard.hpp>
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <memory>
 #include <optional>
@@ -35,10 +34,8 @@ namespace PeerFinder {
 class ManagerImp : public Manager
 {
 public:
-    boost::asio::io_context& io_context_;
-    std::optional<boost::asio::executor_work_guard<
-        boost::asio::io_context::executor_type>>
-        work_;
+    boost::asio::io_service& io_service_;
+    std::optional<boost::asio::io_service::work> work_;
     clock_type& m_clock;
     beast::Journal m_journal;
     StoreSqdb m_store;
@@ -49,18 +46,18 @@ public:
     //--------------------------------------------------------------------------
 
     ManagerImp(
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         clock_type& clock,
         beast::Journal journal,
         BasicConfig const& config,
         beast::insight::Collector::ptr const& collector)
         : Manager()
-        , io_context_(io_context)
-        , work_(std::in_place, boost::asio::make_work_guard(io_context_))
+        , io_service_(io_service)
+        , work_(std::in_place, std::ref(io_service_))
         , m_clock(clock)
         , m_journal(journal)
         , m_store(journal)
-        , checker_(io_context_)
+        , checker_(io_service_)
         , m_logic(clock, m_store, checker_, journal)
         , m_config(config)
         , m_stats(std::bind(&ManagerImp::collect_metrics, this), collector)
@@ -274,14 +271,14 @@ Manager::Manager() noexcept : beast::PropertyStream::Source("peerfinder")
 
 std::unique_ptr<Manager>
 make_Manager(
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     clock_type& clock,
     beast::Journal journal,
     BasicConfig const& config,
     beast::insight::Collector::ptr const& collector)
 {
     return std::make_unique<ManagerImp>(
-        io_context, clock, journal, config, collector);
+        io_service, clock, journal, config, collector);
 }
 
 }  // namespace PeerFinder
diff --git a/src/xrpld/peerfinder/make_Manager.h b/src/xrpld/peerfinder/make_Manager.h
index e55964f4a7..fba95e8f22 100644
--- a/src/xrpld/peerfinder/make_Manager.h
+++ b/src/xrpld/peerfinder/make_Manager.h
@@ -22,7 +22,7 @@
 
 #include <xrpld/peerfinder/PeerfinderManager.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <memory>
 
@@ -32,7 +32,7 @@ namespace PeerFinder {
 /** Create a new Manager. */
 std::unique_ptr<Manager>
 make_Manager(
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     clock_type& clock,
     beast::Journal journal,
     BasicConfig const& config,
diff --git a/src/xrpld/rpc/RPCCall.h b/src/xrpld/rpc/RPCCall.h
index 9e160b8fbd..4c6d25ca57 100644
--- a/src/xrpld/rpc/RPCCall.h
+++ b/src/xrpld/rpc/RPCCall.h
@@ -25,7 +25,7 @@
 #include <xrpl/basics/Log.h>
 #include <xrpl/json/json_value.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 #include <functional>
 #include <string>
@@ -51,7 +51,7 @@ fromCommandLine(
 
 void
 fromNetwork(
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     std::string const& strIp,
     std::uint16_t const iPort,
     std::string const& strUsername,
diff --git a/src/xrpld/rpc/RPCSub.h b/src/xrpld/rpc/RPCSub.h
index 2fd1be0b20..0f106be018 100644
--- a/src/xrpld/rpc/RPCSub.h
+++ b/src/xrpld/rpc/RPCSub.h
@@ -23,7 +23,7 @@
 #include <xrpld/core/JobQueue.h>
 #include <xrpld/rpc/InfoSub.h>
 
-#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 
 namespace ripple {
 
@@ -40,11 +40,11 @@ protected:
     explicit RPCSub(InfoSub::Source& source);
 };
 
-// VFALCO Why is the io_context needed?
+// VFALCO Why is the io_service needed?
 std::shared_ptr<RPCSub>
 make_RPCSub(
     InfoSub::Source& source,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     JobQueue& jobQueue,
     std::string const& strUrl,
     std::string const& strUsername,
diff --git a/src/xrpld/rpc/ServerHandler.h b/src/xrpld/rpc/ServerHandler.h
index d0ebdcd67d..5f72673313 100644
--- a/src/xrpld/rpc/ServerHandler.h
+++ b/src/xrpld/rpc/ServerHandler.h
@@ -111,7 +111,7 @@ private:
     friend std::unique_ptr<ServerHandler>
     make_ServerHandler(
         Application& app,
-        boost::asio::io_context&,
+        boost::asio::io_service&,
         JobQueue&,
         NetworkOPs&,
         Resource::Manager&,
@@ -122,7 +122,7 @@ public:
     ServerHandler(
         ServerHandlerCreator const&,
         Application& app,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         JobQueue& jobQueue,
         NetworkOPs& networkOPs,
         Resource::Manager& resourceManager,
@@ -223,7 +223,7 @@ setup_ServerHandler(Config const& c, std::ostream&& log);
 std::unique_ptr<ServerHandler>
 make_ServerHandler(
     Application& app,
-    boost::asio::io_context&,
+    boost::asio::io_service&,
     JobQueue&,
     NetworkOPs&,
     Resource::Manager&,
diff --git a/src/xrpld/rpc/detail/RPCCall.cpp b/src/xrpld/rpc/detail/RPCCall.cpp
index 57432d920f..aa8c80fff7 100644
--- a/src/xrpld/rpc/detail/RPCCall.cpp
+++ b/src/xrpld/rpc/detail/RPCCall.cpp
@@ -1543,7 +1543,7 @@ rpcClient(
             }
 
             {
-                boost::asio::io_context isService;
+                boost::asio::io_service isService;
                 RPCCall::fromNetwork(
                     isService,
                     setup.client.ip,
@@ -1647,7 +1647,7 @@ fromCommandLine(
 
 void
 fromNetwork(
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     std::string const& strIp,
     std::uint16_t const iPort,
     std::string const& strUsername,
@@ -1685,7 +1685,7 @@ fromNetwork(
 
     HTTPClient::request(
         bSSL,
-        io_context,
+        io_service,
         strIp,
         iPort,
         std::bind(
diff --git a/src/xrpld/rpc/detail/RPCSub.cpp b/src/xrpld/rpc/detail/RPCSub.cpp
index 6619b5ddc5..966ad6df4b 100644
--- a/src/xrpld/rpc/detail/RPCSub.cpp
+++ b/src/xrpld/rpc/detail/RPCSub.cpp
@@ -35,14 +35,14 @@ class RPCSubImp : public RPCSub
 public:
     RPCSubImp(
         InfoSub::Source& source,
-        boost::asio::io_context& io_context,
+        boost::asio::io_service& io_service,
         JobQueue& jobQueue,
         std::string const& strUrl,
         std::string const& strUsername,
         std::string const& strPassword,
         Logs& logs)
         : RPCSub(source)
-        , m_io_context(io_context)
+        , m_io_service(io_service)
         , m_jobQueue(jobQueue)
         , mUrl(strUrl)
         , mSSL(false)
@@ -155,7 +155,7 @@ private:
                     JLOG(j_.info()) << "RPCCall::fromNetwork: " << mIp;
 
                     RPCCall::fromNetwork(
-                        m_io_context,
+                        m_io_service,
                         mIp,
                         mPort,
                         mUsername,
@@ -177,7 +177,7 @@ private:
     }
 
 private:
-    boost::asio::io_context& m_io_context;
+    boost::asio::io_service& m_io_service;
     JobQueue& m_jobQueue;
 
     std::string mUrl;
@@ -207,7 +207,7 @@ RPCSub::RPCSub(InfoSub::Source& source) : InfoSub(source, Consumer())
 std::shared_ptr<RPCSub>
 make_RPCSub(
     InfoSub::Source& source,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     JobQueue& jobQueue,
     std::string const& strUrl,
     std::string const& strUsername,
@@ -216,7 +216,7 @@ make_RPCSub(
 {
     return std::make_shared<RPCSubImp>(
         std::ref(source),
-        std::ref(io_context),
+        std::ref(io_service),
         std::ref(jobQueue),
         strUrl,
         strUsername,
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index f5f5e53238..0c84e59413 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -104,7 +104,7 @@ authorized(Port const& port, std::map<std::string, std::string> const& h)
 ServerHandler::ServerHandler(
     ServerHandlerCreator const&,
     Application& app,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     JobQueue& jobQueue,
     NetworkOPs& networkOPs,
     Resource::Manager& resourceManager,
@@ -113,7 +113,7 @@ ServerHandler::ServerHandler(
     , m_resourceManager(resourceManager)
     , m_journal(app_.journal("Server"))
     , m_networkOPs(networkOPs)
-    , m_server(make_Server(*this, io_context, app_.journal("Server")))
+    , m_server(make_Server(*this, io_service, app_.journal("Server")))
     , m_jobQueue(jobQueue)
 {
     auto const& group(cm.group("rpc"));
@@ -282,13 +282,14 @@ template <class ConstBufferSequence>
 static std::string
 buffers_to_string(ConstBufferSequence const& bs)
 {
+    using boost::asio::buffer_cast;
     using boost::asio::buffer_size;
     std::string s;
     s.reserve(buffer_size(bs));
     // Use auto&& so the right thing happens whether bs returns a copy or
     // a reference
     for (auto&& b : bs)
-        s.append(static_cast<char const*>(b.data()), buffer_size(b));
+        s.append(buffer_cast<char const*>(b), buffer_size(b));
     return s;
 }
 
@@ -1266,7 +1267,7 @@ setup_ServerHandler(Config const& config, std::ostream&& log)
 std::unique_ptr<ServerHandler>
 make_ServerHandler(
     Application& app,
-    boost::asio::io_context& io_context,
+    boost::asio::io_service& io_service,
     JobQueue& jobQueue,
     NetworkOPs& networkOPs,
     Resource::Manager& resourceManager,
@@ -1275,7 +1276,7 @@ make_ServerHandler(
     return std::make_unique<ServerHandler>(
         ServerHandler::ServerHandlerCreator(),
         app,
-        io_context,
+        io_service,
         jobQueue,
         networkOPs,
         resourceManager,
diff --git a/src/xrpld/rpc/handlers/Subscribe.cpp b/src/xrpld/rpc/handlers/Subscribe.cpp
index be08769875..442592da9e 100644
--- a/src/xrpld/rpc/handlers/Subscribe.cpp
+++ b/src/xrpld/rpc/handlers/Subscribe.cpp
@@ -76,7 +76,7 @@ doSubscribe(RPC::JsonContext& context)
             {
                 auto rspSub = make_RPCSub(
                     context.app.getOPs(),
-                    context.app.getIOContext(),
+                    context.app.getIOService(),
                     context.app.getJobQueue(),
                     strUrl,
                     strUsername,