diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml
index b8826f65a..df9b86b02 100644
--- a/.github/workflows/codeql_analysis.yml
+++ b/.github/workflows/codeql_analysis.yml
@@ -52,7 +52,7 @@ jobs:
           queries: security-extended,security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2
+        uses: github/codeql-action/autobuild@24c54180a607b1449ed407dd24f251e4e9147c8d
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d
diff --git a/solarwinds_apm/apm_config.py b/solarwinds_apm/apm_config.py
index eee99dc31..c27e8f399 100644
--- a/solarwinds_apm/apm_config.py
+++ b/solarwinds_apm/apm_config.py
@@ -355,7 +355,11 @@ def _calculate_service_name_lambda(
         if not otel_service_name:
             return self.lambda_function_name
 
-        if otel_service_name == "unknown_service":
+        # e.g. OTel spec and SDK set as unknown_service:<executable_name> or unknown_service
+        if (
+            otel_service_name == "unknown_service"
+            or otel_service_name.startswith("unknown_service:")
+        ):
             # OTEL_SERVICE_NAME was not set
             # and exec wrapper did not wrap instrumentation
             return self.lambda_function_name