diff --git a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
index 955cc33894755cae19f645f45bf3b7056dba93f0..2d6f48ffbbe819158f3ec744ed83bebfe5d8a1df 100644
--- a/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
+++ b/modules/drivers/sqlserver/src/metabase/driver/sqlserver.clj
@@ -80,7 +80,7 @@
   [_ {:keys [user password db host port instance domain ssl]
       :or   {user "dbuser", password "dbpassword", db "", host "localhost"}
       :as   details}]
-  (-> {:applicationName    config/mb-app-id-string
+  (-> {:applicationName    config/mb-version-and-process-identifier
        :subprotocol        "sqlserver"
        ;; it looks like the only thing that actually needs to be passed as the `subname` is the host; everything else
        ;; can be passed as part of the Properties
diff --git a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
index 095f536592da1d7408a152ebc6ddc1b385e23245..69639f50f4cc80f673dabb8659286b25e012a5b8 100644
--- a/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
+++ b/modules/drivers/sqlserver/test/metabase/driver/sqlserver_test.clj
@@ -5,6 +5,7 @@
             [honeysql.core :as hsql]
             [java-time :as t]
             [medley.core :as m]
+            [metabase.config :as config]
             [metabase.driver :as driver]
             [metabase.driver.sql-jdbc.connection :as sql-jdbc.conn]
             [metabase.driver.sql-jdbc.execute :as sql-jdbc.execute]
@@ -36,7 +37,10 @@
 
 (deftest connection-spec-test
   (testing "Test that additional connection string options work (#5296)"
-    (is (= {:applicationName    "Metabase <version>"
+    (is (= {:applicationName    (format
+                                 "Metabase %s [%s]"
+                                 (or (:tag config/mb-version-info) "")
+                                 config/local-process-uuid)
             :database           "birddb"
             :encrypt            false
             :instanceName       nil
@@ -47,16 +51,13 @@
             :subname            "//localhost;trustServerCertificate=false"
             :subprotocol        "sqlserver"
             :user               "cam"}
-           (-> (sql-jdbc.conn/connection-details->spec :sqlserver
-                 {:user               "cam"
-                  :password           "toucans"
-                  :db                 "birddb"
-                  :host               "localhost"
-                  :port               1433
-                  :additional-options "trustServerCertificate=false"})
-               ;; the MB version Is subject to change between test runs, so replace the part like `v.0.25.0` with
-               ;; `<version>`
-               (update :applicationName #(str/replace % #"\s.*$" " <version>")))))))
+           (sql-jdbc.conn/connection-details->spec :sqlserver
+             {:user               "cam"
+              :password           "toucans"
+              :db                 "birddb"
+              :host               "localhost"
+              :port               1433
+              :additional-options "trustServerCertificate=false"})))))
 
 (deftest add-max-results-limit-test
   (mt/test-driver :sqlserver