diff --git a/lib/teslamate/mqtt.ex b/lib/teslamate/mqtt.ex
index 3f305bd9..1dcbe6e9 100644
--- a/lib/teslamate/mqtt.ex
+++ b/lib/teslamate/mqtt.ex
@@ -14,7 +14,7 @@ defmodule TeslaMate.Mqtt do
     client_id = generate_client_id()
 
     children = [
-      {Tortoise.Connection, connection_config(opts) ++ [client_id: client_id]},
+      {Tortoise311.Connection, connection_config(opts) ++ [client_id: client_id]},
       {Publisher, client_id: client_id},
       {PubSub, namespace: opts[:namespace]}
     ]
@@ -24,7 +24,7 @@ defmodule TeslaMate.Mqtt do
 
   # Private
 
-  alias Tortoise.Transport
+  alias Tortoise311.Transport
 
   defp connection_config(opts) do
     socket_opts =
diff --git a/lib/teslamate/mqtt/handler.ex b/lib/teslamate/mqtt/handler.ex
index e5ad6c73..86692ee5 100644
--- a/lib/teslamate/mqtt/handler.ex
+++ b/lib/teslamate/mqtt/handler.ex
@@ -1,5 +1,5 @@
 defmodule TeslaMate.Mqtt.Handler do
-  use Tortoise.Handler
+  use Tortoise311.Handler
 
   require Logger
 
diff --git a/lib/teslamate/mqtt/publisher.ex b/lib/teslamate/mqtt/publisher.ex
index 7cf0b111..9850b489 100644
--- a/lib/teslamate/mqtt/publisher.ex
+++ b/lib/teslamate/mqtt/publisher.ex
@@ -34,17 +34,17 @@ defmodule TeslaMate.Mqtt.Publisher do
 
     case Keyword.get(opts, :qos, 0) do
       0 ->
-        :ok = Tortoise.publish(id, topic, msg, opts)
+        :ok = Tortoise311.publish(id, topic, msg, opts)
         {:reply, :ok, state}
 
       _ ->
-        {:ok, ref} = Tortoise.publish(id, topic, msg, opts)
+        {:ok, ref} = Tortoise311.publish(id, topic, msg, opts)
         {:noreply, %State{state | refs: Map.put(refs, ref, from)}}
     end
   end
 
   @impl true
-  def handle_info({{Tortoise, id}, ref, result}, %State{client_id: id, refs: refs} = state) do
+  def handle_info({{Tortoise311, id}, ref, result}, %State{client_id: id, refs: refs} = state) do
     {from, refs} = Map.pop(refs, ref)
     GenServer.reply(from, result)
     {:noreply, %State{state | refs: refs}}
diff --git a/mix.exs b/mix.exs
index e411dd85..d159eefd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -62,7 +62,7 @@ defmodule TeslaMate.MixProject do
       {:srtm, "~> 0.8.0"},
       {:tesla, "~> 1.4"},
       {:timex, "~> 3.0"},
-      {:tortoise, "~> 0.10"},
+      {:tortoise311, "~> 0.10"},
       {:tzdata, "~> 1.1"},
       {:websockex, "~> 0.4"},
       {:cloak_ecto, "~> 1.2"},
diff --git a/mix.lock b/mix.lock
index 4d12e3cc..a82ba062 100644
--- a/mix.lock
+++ b/mix.lock
@@ -58,7 +58,7 @@
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "tesla": {:hex, :tesla, "1.8.0", "d511a4f5c5e42538d97eef7c40ec4f3e44effdc5068206f42ed859e09e51d1fd", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:exjsx, ">= 3.0.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:finch, "~> 0.13", [hex: :finch, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:gun, ">= 1.0.0", [hex: :gun, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "4.4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:msgpax, "~> 2.3", [hex: :msgpax, repo: "hexpm", optional: true]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"},
   "timex": {:hex, :timex, "3.7.11", "bb95cb4eb1d06e27346325de506bcc6c30f9c6dea40d1ebe390b262fad1862d1", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.20", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 1.1", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"},
-  "tortoise": {:hex, :tortoise, "0.10.0", "d8821b9a5052355ca61d9fa784652f435997fa98b210f88565c98f3494605efd", [:mix], [{:gen_state_machine, "~> 2.0 or ~> 3.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}], "hexpm", "926d97b03cd0d2f6e0e1ebf06c1efa50101de96d0317dea5604c1c9e43e66735"},
+  "tortoise311": {:hex, :tortoise311, "0.11.7", "29e78e6ffa153a2c0728344277e587342cf7035ee62a38dc5656d970007920f0", [:mix], [{:gen_state_machine, "~> 2.0 or ~> 3.0", [hex: :gen_state_machine, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0ef7cf940b50ab47c433323294c9a3bb2883a03e0c7cb37de3e860c0b9ba5bef"},
   "tzdata": {:hex, :tzdata, "1.1.1", "20c8043476dfda8504952d00adac41c6eda23912278add38edc140ae0c5bcc46", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},