diff --git a/packages/commons/src/index.ts b/packages/commons/src/index.ts
index 44cbb30afd..f4eb6ce10b 100644
--- a/packages/commons/src/index.ts
+++ b/packages/commons/src/index.ts
@@ -1,9 +1,10 @@
 import { PT_VERSION } from './version.js';
 
+const env = process.env.AWS_EXECUTION_ENV || 'NA';
 if (!process.env.AWS_SDK_UA_APP_ID) {
-  process.env.AWS_SDK_UA_APP_ID = `PT/TEST/${PT_VERSION}`;
+  process.env.AWS_SDK_UA_APP_ID = `PT/NO-OP/${PT_VERSION}/PTEnv/${env}`;
 } else {
-  process.env.AWS_SDK_UA_APP_ID = `${process.env.AWS_SDK_UA_APP_ID}/PT/TEST/${PT_VERSION}`;
+  process.env.AWS_SDK_UA_APP_ID = `${process.env.AWS_SDK_UA_APP_ID}/PT/NO-OP/${PT_VERSION}/PTEnv/${env}`;
 }
 
 export { addUserAgentMiddleware, isSdkClient } from './awsSdkUtils.js';
diff --git a/packages/commons/tests/unit/awsSdkUtils.test.ts b/packages/commons/tests/unit/awsSdkUtils.test.ts
index ac6ce9f7ae..2029c2ecc7 100644
--- a/packages/commons/tests/unit/awsSdkUtils.test.ts
+++ b/packages/commons/tests/unit/awsSdkUtils.test.ts
@@ -84,7 +84,9 @@ describe('Helpers: awsSdk', () => {
 
   it('concatenates the PT AWS_SDK_UA_APP_ID when one is already set', () => {
     // Assess
-    expect(process.env.AWS_SDK_UA_APP_ID).toEqual(`test/PT/TEST/${version}`);
+    expect(process.env.AWS_SDK_UA_APP_ID).toEqual(
+      `test/PT/NO-OP/${version}/PTEnv/NA`
+    );
   });
 
   describe('Function: customUserAgentMiddleware', () => {