diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index 410519a6c..153a7c7db 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -417,10 +417,7 @@ do_start_listener(quic, ListenerName, #{bind := Bind} = Opts) ->
     case [A || {quicer, _, _} = A <- application:which_applications()] of
         [_] ->
             DefAcceptors = erlang:system_info(schedulers_online) * 8,
-            SSLOpts = maps:merge(
-                maps:with([certfile, keyfile], Opts),
-                maps:get(ssl_options, Opts, #{})
-            ),
+            SSLOpts = maps:get(ssl_options, Opts, #{}),
             ListenOpts =
                 [
                     {certfile, emqx_schema:naive_env_interpolation(maps:get(certfile, SSLOpts))},
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index e9fb47eec..b20256c0d 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -980,7 +980,7 @@ fields("mqtt_quic_listener") ->
             sc(
                 string(),
                 #{
-                    %% TODO: deprecated => {since, "5.1.0"}
+                    deprecated => {since, "5.1.0"},
                     desc => ?DESC(fields_mqtt_quic_listener_certfile),
                     importance => ?IMPORTANCE_HIDDEN
                 }
@@ -989,7 +989,7 @@ fields("mqtt_quic_listener") ->
             sc(
                 string(),
                 #{
-                    %% TODO: deprecated => {since, "5.1.0"}
+                    deprecated => {since, "5.1.0"},
                     desc => ?DESC(fields_mqtt_quic_listener_keyfile),
                     importance => ?IMPORTANCE_HIDDEN
                 }
@@ -1068,7 +1068,7 @@ fields("mqtt_quic_listener") ->
                 #{
                     default => 0,
                     desc => ?DESC(fields_mqtt_quic_listener_idle_timeout),
-                    %% TODO: deprecated => {since, "5.1.0"}
+                    deprecated => {since, "5.1.0"},
                     %% deprecated, use idle_timeout_ms instead
                     importance => ?IMPORTANCE_HIDDEN
                 }
@@ -1085,7 +1085,7 @@ fields("mqtt_quic_listener") ->
                 #{
                     default => <<"10s">>,
                     desc => ?DESC(fields_mqtt_quic_listener_handshake_idle_timeout),
-                    %% TODO: deprecated => {since, "5.1.0"}
+                    deprecated => {since, "5.1.0"},
                     %% use handshake_idle_timeout_ms
                     importance => ?IMPORTANCE_HIDDEN
                 }