diff --git a/src/ldclient_event_process_server.erl b/src/ldclient_event_process_server.erl
index 087d1f8..fb80610 100644
--- a/src/ldclient_event_process_server.erl
+++ b/src/ldclient_event_process_server.erl
@@ -254,8 +254,8 @@ format_event_set_context(<<"index">>, Context, OutputEvent, GlobalPrivateAttribu
     OutputEvent#{
         <<"context">> => ldclient_context_filter:format_context_for_event(GlobalPrivateAttributes, Context)
     };
-format_event_set_context(<<"custom">>, Context, OutputEvent, _) ->
-    OutputEvent#{<<"contextKeys">> => ldclient_context:get_keys_and_kinds(Context)}.
+format_event_set_context(<<"custom">>, Context, OutputEvent, GlobalPrivateAttributes) ->
+    OutputEvent#{<<"context">> => ldclient_context_filter:format_context_for_event(GlobalPrivateAttributes, Context)}.
 
 -spec maybe_set_metric_value(ldclient_event:event(), map()) -> map().
 maybe_set_metric_value(#{metric_value := MetricValue}, OutputEvent) ->
diff --git a/test-service/src/ts_service_request_handler.erl b/test-service/src/ts_service_request_handler.erl
index a517c69..7404923 100644
--- a/test-service/src/ts_service_request_handler.erl
+++ b/test-service/src/ts_service_request_handler.erl
@@ -74,7 +74,7 @@ get_service_detail(Req, State) ->
       <<"tags">>,
       <<"server-side-polling">>,
       <<"user-type">>,
-      <<"inline-context">>,
+      <<"inline-context-all">>,
       <<"anonymous-redaction">>,
       <<"tls:custom-ca">>,
       <<"tls:skip-verify-peer">>,
diff --git a/test/ldclient_events_SUITE.erl b/test/ldclient_events_SUITE.erl
index 0869459..aef50ef 100644
--- a/test/ldclient_events_SUITE.erl
+++ b/test/ldclient_events_SUITE.erl
@@ -786,7 +786,7 @@ add_custom_events(_) ->
         #{
             <<"key">> := <<"event-foo">>,
             <<"kind">> := <<"custom">>,
-            <<"contextKeys">> := #{<<"user">> := <<"123456">>},
+            <<"context">> := #{<<"key">> := <<"123456">>, <<"kind">> := <<"user">>, <<"firstName">> := <<"Tester">>, <<"lastName">> := <<"Testerson">>},
             <<"data">> := #{<<"k1">> := <<"v1">>},
             <<"creationDate">> := _
         },
@@ -798,7 +798,7 @@ add_custom_events(_) ->
         #{
             <<"key">> := <<"event-bar">>,
             <<"kind">> := <<"custom">>,
-            <<"contextKeys">> := #{<<"user">> := <<"abcdef">>},
+            <<"context">> := #{<<"key">> := <<"abcdef">>, <<"kind">> := <<"user">>, <<"firstName">> := <<"Tester">>, <<"lastName">> := <<"Testerson">>},
             <<"data">> := #{<<"k2">> := <<"v2">>},
             <<"creationDate">> := _
         },
@@ -810,7 +810,7 @@ add_custom_events(_) ->
         #{
             <<"key">> := <<"event-baz">>,
             <<"kind">> := <<"custom">>,
-            <<"contextKeys">> := #{<<"user">> := <<"987656">>},
+            <<"context">> := #{<<"key">> := <<"987656">>, <<"kind">> := <<"user">>, <<"firstName">> := <<"Tester">>, <<"lastName">> := <<"Testerson">>},
             <<"data">> := #{<<"k3">> := <<"v3">>},
             <<"metricValue">> := 123,
             <<"creationDate">> := _