diff --git a/include/network_interface/network_interface.h b/include/network_interface/network_interface.h
index 7d9f80c..e38196d 100644
--- a/include/network_interface/network_interface.h
+++ b/include/network_interface/network_interface.h
@@ -52,7 +52,7 @@ class UDPInterface
 
 private:
   uint32_t receive_buffer_size_ = 1024;
-  boost::asio::io_service io_service_;
+  boost::asio::io_context io_service_;
   boost::asio::ip::udp::socket socket_;
   boost::asio::ip::udp::endpoint sender_endpoint_;
 };
@@ -78,7 +78,7 @@ class TCPInterface
   // Send a message
   ReturnStatuses write(const std::vector<uint8_t> &msg);
 private:
-  boost::asio::io_service io_service_;
+  boost::asio::io_context io_service_;
   boost::asio::ip::tcp::socket socket_;
   boost::system::error_code error_;
 };
diff --git a/include/network_interface/udp_server.h b/include/network_interface/udp_server.h
index b454ead..7f542a7 100644
--- a/include/network_interface/udp_server.h
+++ b/include/network_interface/udp_server.h
@@ -63,7 +63,7 @@ class UDPServer
   void handleSend(std::vector<uint8_t> sent_payload,
     const boost::system::error_code& ec, std::size_t bytes_transferred);
 
-  boost::asio::io_service io_service_;
+  boost::asio::io_context io_service_;
   boost::asio::ip::udp::socket socket_;
   boost::asio::ip::udp::endpoint server_endpoint_;
   boost::asio::ip::udp::endpoint client_endpoint_;
diff --git a/src/tcp_interface.cpp b/src/tcp_interface.cpp
index dbe8394..c5142ac 100644
--- a/src/tcp_interface.cpp
+++ b/src/tcp_interface.cpp
@@ -27,8 +27,8 @@ ReturnStatuses TCPInterface::open(std::string ip_address, const int &port)
   std::stringstream sPort;
   sPort << port;
   tcp::resolver res(io_service_);
-  tcp::resolver::query query(tcp::v4(), ip_address, sPort.str());
-  tcp::resolver::iterator it = res.resolve(query);
+  auto endpoints = res.resolve(tcp::v4(), ip_address, sPort.str());
+  auto it = endpoints.begin();
   boost::system::error_code ec;
 
   socket_.connect(*it, ec);
@@ -78,7 +78,7 @@ ReturnStatuses TCPInterface::read(std::vector<uint8_t> *msg)
   boost::asio::read(socket_, boost::asio::buffer(*msg), error_);
 
   // Reset the io service so that it is available for the next call to TCPInterface::read
-  io_service_.reset();
+  io_service_.restart();
 
   if (error_.value() == boost::system::errc::success)
     return ReturnStatuses::OK;
@@ -97,7 +97,7 @@ ReturnStatuses TCPInterface::read_exactly(std::vector<uint8_t> *msg, const size_
   boost::asio::read(socket_, boost::asio::buffer(*msg), boost::asio::transfer_exactly(bytes_to_read));
 
   // Reset the io service so that it is available for the next call to TCPInterface::read_exactly
-  io_service_.reset();
+  io_service_.restart();
 
   if (error_.value() == boost::system::errc::success)
     return ReturnStatuses::OK;
diff --git a/src/udp_interface.cpp b/src/udp_interface.cpp
index 95951b2..3630604 100644
--- a/src/udp_interface.cpp
+++ b/src/udp_interface.cpp
@@ -33,8 +33,8 @@ ReturnStatuses UDPInterface::open(const std::string& ip_address, uint32_t port)
   std::stringstream sPort;
   sPort << port;
   udp::resolver res(io_service_);
-  udp::resolver::query query(udp::v4(), ip_address.c_str(), sPort.str());
-  sender_endpoint_ = *res.resolve(query);
+  auto endpoints = res.resolve(udp::v4(), ip_address.c_str(), sPort.str());
+  sender_endpoint_ = *endpoints.begin();
   boost::system::error_code ec;
 
   socket_.connect(sender_endpoint_, ec);
diff --git a/src/udp_server.cpp b/src/udp_server.cpp
index db24b3d..a56895f 100644
--- a/src/udp_server.cpp
+++ b/src/udp_server.cpp
@@ -28,8 +28,8 @@ ReturnStatuses UDPServer::open(const std::string& ip_address, uint32_t port)
   std::stringstream sPort;
   sPort << port;
   udp::resolver res(io_service_);
-  udp::resolver::query query(udp::v4(), ip_address.c_str(), sPort.str());
-  server_endpoint_ = *res.resolve(query);
+  auto endpoints = res.resolve(udp::v4(), ip_address.c_str(), sPort.str());
+  server_endpoint_ = *endpoints.begin();
   boost::system::error_code ec;
 
   socket_.open(boost::asio::ip::udp::v4(), ec);