diff --git a/repertory/librepertory/include/comm/packet/packet_server.hpp b/repertory/librepertory/include/comm/packet/packet_server.hpp
index 2e916f5e..8c847a7e 100644
--- a/repertory/librepertory/include/comm/packet/packet_server.hpp
+++ b/repertory/librepertory/include/comm/packet/packet_server.hpp
@@ -52,8 +52,8 @@ public:
 
 private:
   struct connection {
-    connection(boost::asio::io_service &io_service, tcp::acceptor &acceptor_)
-        : socket(io_service), acceptor(acceptor_) {}
+    connection(io_context &context, tcp::acceptor &acceptor_)
+        : socket(context), acceptor(acceptor_) {}
 
     tcp::socket socket;
     tcp::acceptor &acceptor;
@@ -68,7 +68,7 @@ private:
   std::string encryption_token_;
   closed_callback closed_;
   message_handler_callback message_handler_;
-  boost::asio::io_context io_context_;
+  io_context io_context_;
   std::unique_ptr<std::thread> server_thread_;
   std::vector<std::thread> service_threads_;
   std::recursive_mutex connection_mutex_;
diff --git a/repertory/librepertory/src/comm/packet/packet_client.cpp b/repertory/librepertory/src/comm/packet/packet_client.cpp
index f189749a..b5043d6f 100644
--- a/repertory/librepertory/src/comm/packet/packet_client.cpp
+++ b/repertory/librepertory/src/comm/packet/packet_client.cpp
@@ -155,7 +155,7 @@ auto packet_client::read_packet(client &cli, packet &response)
 void packet_client::resolve() {
   if (resolve_results_.empty()) {
     resolve_results_ = tcp::resolver(io_context_)
-                           .resolve({host_name_or_ip_, std::to_string(port_)});
+                           .resolve(host_name_or_ip_, std::to_string(port_));
   }
 }
 
diff --git a/support/src/utils/common.cpp b/support/src/utils/common.cpp
index 64f8fb01..747e99a8 100644
--- a/support/src/utils/common.cpp
+++ b/support/src/utils/common.cpp
@@ -25,8 +25,8 @@
 #include "utils/string.hpp"
 
 namespace repertory::utils {
-auto compare_version_strings(std::string version1,
-                             std::string version2) -> std::int32_t {
+auto compare_version_strings(std::string version1, std::string version2)
+    -> std::int32_t {
 
   if (utils::string::contains(version1, "-")) {
     version1 = utils::string::split(version1, '-', true)[0U];
@@ -132,7 +132,7 @@ auto get_next_available_port(std::uint16_t first_port,
 
   boost::system::error_code error_code{};
   while (first_port != 0U) {
-    io_service svc{};
+    io_context svc{};
     tcp::acceptor acceptor(svc);
     acceptor.open(tcp::v4(), error_code) ||
         acceptor.bind({tcp::v4(), first_port}, error_code);