diff --git a/lib/tusker_push_web/controllers/healthcheck_controller.ex b/lib/tusker_push_web/controllers/healthcheck_controller.ex
index 81ed14e..179da4d 100644
--- a/lib/tusker_push_web/controllers/healthcheck_controller.ex
+++ b/lib/tusker_push_web/controllers/healthcheck_controller.ex
@@ -2,6 +2,7 @@ defmodule TuskerPushWeb.HealthcheckController do
   use TuskerPushWeb, :controller
 
   def healthcheck(conn, _params) do
+    OpenTelemetry.Tracer.set_attribute(:request_id, conn.assigns.request_id)
     send_resp(conn, 200, "ok")
   end
 end
diff --git a/lib/tusker_push_web/controllers/push_controller.ex b/lib/tusker_push_web/controllers/push_controller.ex
index d9c5d75..e4cfb0b 100644
--- a/lib/tusker_push_web/controllers/push_controller.ex
+++ b/lib/tusker_push_web/controllers/push_controller.ex
@@ -5,6 +5,8 @@ defmodule TuskerPushWeb.PushController do
   require Logger
 
   def push(conn, %{"env" => env, "apns_device_token" => apns_device_token, "ctx" => context}) do
+    OpenTelemetry.Tracer.set_attribute(:request_id, conn.assigns.request_id)
+
     with {:apns_env, apns_env} <- {:apns_env, get_apns_env(env)},
          {:encoding, ["aesgcm"]} <- {:encoding, get_req_header(conn, "content-encoding")},
          {:body, {:ok, body, conn}} <- {:body, read_body(conn)},
diff --git a/lib/tusker_push_web/endpoint.ex b/lib/tusker_push_web/endpoint.ex
index 8556790..11abe8a 100644
--- a/lib/tusker_push_web/endpoint.ex
+++ b/lib/tusker_push_web/endpoint.ex
@@ -31,7 +31,7 @@ defmodule TuskerPushWeb.Endpoint do
     plug Phoenix.CodeReloader
   end
 
-  plug Plug.RequestId
+  plug Plug.RequestId, assign_as: :request_id
   plug Plug.Telemetry, event_prefix: [:phoenix, :endpoint]
 
   plug Plug.Parsers,