diff --git a/domain-server/src/DomainServerExporter.cpp b/domain-server/src/DomainServerExporter.cpp
index 8d6dc348ff..a7affaf4dd 100644
--- a/domain-server/src/DomainServerExporter.cpp
+++ b/domain-server/src/DomainServerExporter.cpp
@@ -45,8 +45,8 @@ static const QMap<QString, DomainServerExporter::MetricType> TYPE_MAP {
     { "asset_server_connection_stats_rtt_ms"                                                      , DomainServerExporter::MetricType::Gauge },
     { "asset_server_connection_stats_up_mb_s"                                                     , DomainServerExporter::MetricType::Gauge },
     { "asset_server_downstream_stats_duplicates"                                                  , DomainServerExporter::MetricType::Counter },
-    { "asset_server_downstream_stats_recvd_packets"                                               , DomainServerExporter::MetricType::Counter },
     { "asset_server_downstream_stats_recvd_p_s"                                                   , DomainServerExporter::MetricType::Gauge },
+    { "asset_server_downstream_stats_recvd_packets"                                               , DomainServerExporter::MetricType::Counter },
     { "asset_server_downstream_stats_sent_ack"                                                    , DomainServerExporter::MetricType::Counter },
     { "asset_server_io_stats_inbound_kbps"                                                        , DomainServerExporter::MetricType::Gauge },
     { "asset_server_io_stats_inbound_pps"                                                         , DomainServerExporter::MetricType::Gauge },
@@ -55,8 +55,8 @@ static const QMap<QString, DomainServerExporter::MetricType> TYPE_MAP {
     { "asset_server_upstream_stats_procd_ack"                                                     , DomainServerExporter::MetricType::Counter },
     { "asset_server_upstream_stats_recvd_ack"                                                     , DomainServerExporter::MetricType::Counter },
     { "asset_server_upstream_stats_retransmitted"                                                 , DomainServerExporter::MetricType::Counter },
-    { "asset_server_upstream_stats_sent_packets"                                                  , DomainServerExporter::MetricType::Counter },
     { "asset_server_upstream_stats_sent_p_s"                                                      , DomainServerExporter::MetricType::Gauge },
+    { "asset_server_upstream_stats_sent_packets"                                                  , DomainServerExporter::MetricType::Counter },
     { "audio_mixer_assignment_stats_num_queued_check_ins"                                         , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_avg_listeners_per_frame"                                                       , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_avg_listeners_silent_per_frame"                                                , DomainServerExporter::MetricType::Gauge },
@@ -81,11 +81,11 @@ static const QMap<QString, DomainServerExporter::MetricType> TYPE_MAP {
     { "audio_mixer_io_stats_outbound_pps"                                                         , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_available"                                         , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_available_avg_10s"                                 , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_downstream_avg_gap_30s_usecs"                                 , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_downstream_avg_gap_usecs"                                     , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_desired"                                           , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_lost_percent"                                      , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_lost_percent_30s"                                  , DomainServerExporter::MetricType::Gauge },
-    { "audio_mixer_listeners_jitter_downstream_avg_gap_30s_usecs"                                 , DomainServerExporter::MetricType::Gauge },
-    { "audio_mixer_listeners_jitter_downstream_avg_gap_usecs"                                     , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_max_gap_30s_usecs"                                 , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_max_gap_usecs"                                     , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_listeners_jitter_downstream_min_gap_30s_usecs"                                 , DomainServerExporter::MetricType::Gauge },
@@ -95,6 +95,23 @@ static const QMap<QString, DomainServerExporter::MetricType> TYPE_MAP {
     { "audio_mixer_listeners_jitter_downstream_starves"                                           , DomainServerExporter::MetricType::Counter },
     { "audio_mixer_listeners_jitter_downstream_unplayed"                                          , DomainServerExporter::MetricType::Counter },
     { "audio_mixer_listeners_jitter_injectors"                                                    , DomainServerExporter::MetricType::Counter },
+    { "audio_mixer_listeners_jitter_upstream_available"                                           , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_available_avg_10s"                                   , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_avg_gap_30s_usecs"                                   , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_avg_gap_usecs"                                       , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_desired_calc"                                        , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_lost_percent"                                        , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_lost_percent_30s"                                    , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_max_gap_30s_usecs"                                   , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_max_gap_usecs"                                       , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_mic_desired"                                         , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_min_gap_30s_usecs"                                   , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_min_gap_usecs"                                       , DomainServerExporter::MetricType::Gauge },
+    { "audio_mixer_listeners_jitter_upstream_not_mixed"                                           , DomainServerExporter::MetricType::Counter },
+    { "audio_mixer_listeners_jitter_upstream_overflows"                                           , DomainServerExporter::MetricType::Counter },
+    { "audio_mixer_listeners_jitter_upstream_silents_dropped"                                     , DomainServerExporter::MetricType::Counter },
+    { "audio_mixer_listeners_jitter_upstream_starves"                                             , DomainServerExporter::MetricType::Counter },
+    { "audio_mixer_listeners_jitter_upstream_unplayed"                                            , DomainServerExporter::MetricType::Counter },
     { "audio_mixer_listeners_outbound_kbps"                                                       , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_mix_stats_active_streams"                                                      , DomainServerExporter::MetricType::Gauge },
     { "audio_mixer_mix_stats_active_to_inactive"                                                  , DomainServerExporter::MetricType::Counter },