diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index 3a744dcb52c..6778c7461b9 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -10,7 +10,7 @@ on:
 env:
   # set this to <repo>:<branch/sha> to build and test with an unreleased
   # version of the azure-monitor-opentelemetry-autoconfigure dependency
-  AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT:
+  AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT: trask/azure-sdk-for-java:session-id
 
 jobs:
   spotless:
diff --git a/agent/instrumentation/applicationinsights-web-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java b/agent/instrumentation/applicationinsights-web-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java
index adeec540796..6363d883040 100644
--- a/agent/instrumentation/applicationinsights-web-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java
+++ b/agent/instrumentation/applicationinsights-web-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java
@@ -43,7 +43,7 @@ public static void methodEnter(
         @Advice.This UserContext userContext, @Advice.Argument(0) String name) {
       Span span = VirtualField.find(UserContext.class, Span.class).get(userContext);
       if (span != null) {
-        span.setAttribute("enduser.id", name);
+        span.setAttribute("enduser.pseudo.id", name);
       }
     }
   }
diff --git a/agent/instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java b/agent/instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java
index b7d0e1a2c0c..a8064d8ae83 100644
--- a/agent/instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java
+++ b/agent/instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java
@@ -69,7 +69,7 @@ void setRequestUser() {
                         .hasAttributesSatisfyingExactly(
                             equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, "Code"),
                             equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "setUser"),
-                            equalTo(EnduserIncubatingAttributes.ENDUSER_ID, "myuser")),
+                            equalTo(EnduserIncubatingAttributes.ENDUSER_PSEUDO_ID, "myuser")),
                 span ->
                     span.hasName("Code.internalSetUser")
                         .hasKind(INTERNAL)
diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/OpenTelemetryApiSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
index f4e1ff7b1b0..bf59ec2117e 100644
--- a/smoke-tests/apps/OpenTelemetryApiSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
+++ b/smoke-tests/apps/OpenTelemetryApiSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java
@@ -20,6 +20,8 @@ public String testApi() {
     Span.current().setAttribute("myattr1", "myvalue1");
     Span.current().setAttribute("myattr2", "myvalue2");
     Span.current().setAttribute("enduser.id", "myuser");
+    Span.current().setAttribute("enduser.pseudo.id", "mypseudo");
+    Span.current().setAttribute("session.id", "mysession");
     Span.current().updateName("myspanname");
     return "OK!";
   }
diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportControllerSpansEnabledTest.java b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportControllerSpansEnabledTest.java
index 1bc05995639..5d5578e3218 100644
--- a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportControllerSpansEnabledTest.java
+++ b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportControllerSpansEnabledTest.java
@@ -54,7 +54,9 @@ void testApi() throws Exception {
         .isEqualTo("testroleinstance");
     assertThat(telemetry.rddEnvelope1.getTags())
         .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
-    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "myuser");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.authUserId", "myuser");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "mypseudo");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.session.id", "mysession");
 
     SmokeTestExtension.assertParentChild(
         telemetry.rd,
diff --git a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java
index 0953e282707..bb90b290cec 100644
--- a/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java
+++ b/smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java
@@ -50,7 +50,9 @@ void testApi() throws Exception {
 
     assertThat(telemetry.rdEnvelope.getTags())
         .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
-    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "myuser");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.authUserId", "myuser");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "mypseudo");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.session.id", "mysession");
   }
 
   @Test