diff --git a/lib/client/socket.ts b/lib/client/socket.ts
index 40204ccb1..7e113bb9c 100644
--- a/lib/client/socket.ts
+++ b/lib/client/socket.ts
@@ -23,6 +23,7 @@ import { getServerId } from './dispatcher';
 import { determineFilterType } from './utils/filterSelection';
 import { notificationHandler } from './socketHandlers/notificationHandler';
 import { renewBrokerServerConnection } from './auth/brokerServerConnection';
+import version from '../common/utils/version';
 
 export const createWebSocketConnectionPairs = async (
   websocketConnections: WebSocketConnection[],
@@ -139,13 +140,15 @@ export const createWebSocket = (
     pong: parseInt(localClientOps.config.socketPongTimeout) || 10000,
     timeout: parseInt(localClientOps.config.socketConnectTimeout) || 10000,
   };
-
+  console.log('@@@@@@@@@@@@@@@@@@@@@2');
+  console.log(clientOpts.accessToken?.authHeader);
   if (clientOpts.accessToken && clientOpts.config.UNIVERSAL_BROKER_GA) {
     socketSettings['transport'] = {
       extraHeaders: {
         Authorization: clientOpts.accessToken?.authHeader,
         'x-snyk-broker-client-id': identifyingMetadata.clientId,
         'x-snyk-broker-client-role': identifyingMetadata.role,
+        'x-broker-client-version': version,
       },
     };
   }
@@ -183,6 +186,7 @@ export const createWebSocket = (
           Authorization: clientOpts.accessToken!.authHeader,
           'x-snyk-broker-client-id': identifyingMetadata.clientId,
           'x-snyk-broker-client-role': identifyingMetadata.role,
+          'x-broker-client-version': version,
         };
 
         logger.debug(
diff --git a/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts b/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
index d1520362d..a6bb8ada1 100644
--- a/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
+++ b/lib/hybrid-sdk/http/downstream-post-stream-to-server.ts
@@ -66,7 +66,7 @@ class BrokerServerPostResponseHandler {
     try {
       const backendHostname =
         this.#config.universalBrokerEnabled && this.#config.universalBrokerGa
-          ? `${this.#config.API_BASE_URL}/hidden/broker`
+          ? `${this.#config.apiHostname}/hidden/broker`
           : this.#config.brokerServerUrl;
       const url = new URL(
         `${backendHostname}/response-data/${this.#brokerToken}/${