diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..4d054715e
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="93fd3536-cdd9-4dcf-bd13-3dffde72df9b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/docs/sdks/sdk-ref-java.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/sdks/sdk-ref-java.md" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;aulme&quot;
+  }
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;git@github.com:IABTechLab/uid2docs.git&quot;,
+    &quot;accountId&quot;: &quot;5c9dc7f0-68cd-4435-80cb-114a27c5d8ee&quot;
+  }
+}</component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 3
+}</component>
+  <component name="ProjectId" id="2yyqGYAb6qjgNC9D07EcwC6WwiM" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;aul-UID2-5560-java-sdk-v3-identity-map-docs&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;/Users/aleksandrs.ulme/Documents/uid2docs/node_modules/prettier&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;com.intellij.liquibase.common.gui.settings.db.DiffChangesConfigurable&quot;,
+    &quot;ts.external.directory.path&quot;: &quot;/Users/aleksandrs.ulme/Documents/uid2docs/node_modules/typescript/lib&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/docs/guides/images" />
+    </key>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-jdk-9823dce3aa75-fbdcb00ec9e3-intellij.indexing.shared.core-IU-251.26094.121" />
+        <option value="bundled-js-predefined-d6986cc7102b-b26f3e71634d-JavaScript-IU-251.26094.121" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="93fd3536-cdd9-4dcf-bd13-3dffde72df9b" name="Changes" comment="" />
+      <created>1750817065580</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1750817065580</updated>
+      <workItem from="1750817066724" duration="33324000" />
+      <workItem from="1751022517243" duration="53679000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+</project>
\ No newline at end of file
diff --git a/docs/guides/operator-guide-aws-marketplace.md b/docs/guides/operator-guide-aws-marketplace.md
index ddd80cd5b..136ca2003 100644
--- a/docs/guides/operator-guide-aws-marketplace.md
+++ b/docs/guides/operator-guide-aws-marketplace.md
@@ -124,7 +124,7 @@ Here's what you can customize during or after the [deployment](#deployment):
 - VPC: You must specify the existing VPC and related VPC Subnet IDs.
 - Root volume size (8G Minimum)
 - SSH key: This is the SSH key that you use to access the UID2 Operator EC2 instances.
-- [Instance type](https://aws.amazon.com/ec2/instance-types/m5/): m5.2xlarge, m5.4xlarge, and so on. If there is no customization, the default value, m5.2xlarge, is recommended.
+- [Instance type](https://aws.amazon.com/ec2/instance-types/): m5.2xlarge, m5.4xlarge, and so on. If there is no customization, the default value, m5.2xlarge, is recommended.
 
 ### Security Group Policy
 
diff --git a/docs/sdks/sdk-ref-java.md b/docs/sdks/sdk-ref-java.md
index 4884c6741..ab679991c 100644
--- a/docs/sdks/sdk-ref-java.md
+++ b/docs/sdks/sdk-ref-java.md
@@ -144,7 +144,7 @@ If you're using the SDK's HTTP implementation, follow these steps.
 
 2. Call a function that takes the user's email address or phone number as input and generates a `TokenGenerateResponse` object. The following example uses an email address:
    ```java
-   TokenGenerateResponse tokenGenerateResponse = publisherUid2Client.generateTokenResponse(TokenGenerateInput.fromEmail(emailAddress).doNotGenerateTokensForOptedOut());
+   TokenGenerateResponse tokenGenerateResponse = publisherUid2Client.generateTokenResponse(TokenGenerateInput.fromEmail("user@example.com").doNotGenerateTokensForOptedOut());
    ```
 
    :::important
@@ -192,7 +192,9 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
    2. Determine if the identity can be refreshed (that is, the refresh token hasn't expired):
 
       ```java
-      if (identity == null || !identity.isRefreshable()) { we must no longer use this identity (for example, remove this identity from the user's session) }
+      if (identity == null || !identity.isRefreshable()) { 
+          // we must no longer use this identity (for example, remove this identity from the user's session) 
+      }
       ```
    3. Determine if a refresh is needed:
 
@@ -219,13 +221,13 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
 2. Call a function that takes the user's email address or phone number as input and creates a secure request data envelope. See [Encrypting requests](../getting-started/gs-encryption-decryption.md#encrypting-requests). The following example uses an email address:
 
     ```java
-    EnvelopeV2 envelope = publisherUid2Helper.createEnvelopeForTokenGenerateRequest(TokenGenerateInput.fromEmail(emailAddress).doNotGenerateTokensForOptedOut());
+    EnvelopeV2 envelope = publisherUid2Helper.createEnvelopeForTokenGenerateRequest(TokenGenerateInput.fromEmail("user@example.com").doNotGenerateTokensForOptedOut());
     ```
 3. Using an HTTP client library of your choice, post this envelope to the [POST&nbsp;token/generate](../endpoints/post-token-generate.md) endpoint, including headers and body:
    1. Headers: Depending on your HTTP library, this might look something like the following:  
     
       `.putHeader("Authorization", "Bearer " + UID2_API_KEY)`  
-      `.putHeader("X-UID2-Client-Version", PublisherUid2Helper.getVersionHeader())`
+      `.putHeader("X-UID2-Client-Version", PublisherUid2Helper.getVersionHttpHeader())`
    2. Body: `envelope.getEnvelope()`
    :::important
    <!-- - Be sure to call the POST&nbsp;/token/generate endpoint only when you have a legal basis to convert the user’s <Link href="../ref-info/glossary-uid#gl-dii">directly identifying information (DII)</Link> to UID2 tokens for targeted advertising.
@@ -278,7 +280,9 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
    2. Determine whether the identity can be refreshed (that is, the refresh token hasn't expired): 
     
       ```java
-      if (identity == null || !identity.isRefreshable()) { we must no longer use this identity (for example, remove this identity from the user's session) }
+      if (identity == null || !identity.isRefreshable()) { 
+          // we must no longer use this identity (for example, remove this identity from the user's session) 
+      }
       ```
    3. Determine whether a refresh is needed:
    
@@ -289,7 +293,7 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
    1. Headers: Depending on your HTTP library, this might look something like the following:
     
       `.putHeader("Authorization", "Bearer " + UID2_API_KEY)`  
-      `.putHeader("X-UID2-Client-Version", PublisherUid2Helper.getVersionHeader())`. 
+      `.putHeader("X-UID2-Client-Version", PublisherUid2Helper.getVersionHttpHeader())`. 
    2. Body: `identity.getRefreshToken()`
 5. If the refresh HTTP response status code is 200:
 
@@ -302,6 +306,175 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
 
 ## Usage for Advertisers/Data Providers
 
+1. Create an IdentityMapV3Client as an instance variable:
+   ```java
+   final private IdentityMapV3Client identityMapV3Client = new IdentityMapV3Client(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
+   ```
+
+2. Create an IdentityMapV3Input object. You can use emails, phone numbers, or both, hashed or raw:
+   ```java
+   IdentityMapV3Input input = IdentityMapV3Input.fromEmails(Arrays.asList("user@example.com", "user2@example.com"));
+   ```
+   
+   Or combine multiple identity types:
+   ```java
+   IdentityMapV3Input input = new IdentityMapV3Input()
+       .withEmail("user@example.com")
+       .withPhone("+12345678901")
+       .withHashedEmail("preHashedEmail")
+       .withHashedPhone("preHashedPhone");
+   ```
+
+3. Call a function that takes the input and generates an IdentityMapV3Response object:
+   ```java
+   IdentityMapV3Response identityMapResponse = identityMapV3Client.generateIdentityMap(input);
+   ```
+
+4. Retrieve the mapped and unmapped results:
+   ```java
+   HashMap<String, IdentityMapV3Response.MappedIdentity> mappedIdentities = identityMapResponse.getMappedIdentities();
+   HashMap<String, IdentityMapV3Response.UnmappedIdentity> unmappedIdentities = identityMapResponse.getUnmappedIdentities();
+   ```
+
+5. Process the results. For successfully mapped identities:
+   ```java
+   IdentityMapV3Response.MappedIdentity mappedIdentity = mappedIdentities.get("user@example.com");
+   if (mappedIdentity != null) {
+       String currentUid = mappedIdentity.getCurrentRawUid();      // Current raw UID2
+       String previousUid = mappedIdentity.getPreviousRawUid();   // Previous raw UID2 (nullable, only available for 90 days after rotation)
+       Instant refreshFrom = mappedIdentity.getRefreshFrom();     // When to refresh this identity
+   } else {
+       IdentityMapV3Response.UnmappedIdentity unmappedIdentity = unmappedIdentities.get("user@example.com");
+       UnmappedIdentityReason reason = unmappedIdentity.getReason(); // OPTOUT, INVALID_IDENTIFIER, or UNKNOWN
+   }
+   ```
+
+>**Note:** The SDK automatically handles email normalization and hashing, ensuring that raw email addresses and phone numbers do not leave your server.
+
+### Usage Example
+
+```java
+IdentityMapV3Client client = new IdentityMapV3Client(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
+
+// Example 1: Single identity type
+IdentityMapV3Input emailInput = IdentityMapV3Input.fromEmails(
+    Arrays.asList("user@example.com", "optout@example.com")
+);
+IdentityMapV3Response emailResponse = client.generateIdentityMap(emailInput);
+
+// Process email results
+emailResponse.getMappedIdentities().forEach((email, identity) -> {
+    System.out.println("Email: " + email);
+    System.out.println("Current UID: " + identity.getCurrentRawUid());
+    System.out.println("Previous UID: " + identity.getPreviousRawUid());
+    System.out.println("Refresh from: " + identity.getRefreshFrom());
+});
+
+emailResponse.getUnmappedIdentities().forEach((email, identity) -> {
+    System.out.println("Unmapped email: " + email + " - Reason: " + identity.getReason());
+});
+
+// Example 2: Mixed identity types in single request
+IdentityMapV3Input mixedInput = new IdentityMapV3Input()
+    .withEmail("user1@example.com")
+    .withPhone("+12345678901")
+    .withHashedEmail("preHashedEmailValue")
+    .withHashedPhone("preHashedPhoneValue");
+
+IdentityMapV3Response mixedResponse = client.generateIdentityMap(mixedInput);
+```
+
+## Migration From Older Identity Map Version
+
+### Migration Overview
+
+Improvements provided by the new Identity Map version:
+- **Support for Multiple Identity Types**: Process emails and phones in a single request
+- **Simpler refresh management**: Re-map on reaching refresh timestamps instead of monitoring salt buckets
+- **Previous raw UID2 availability**: You can see previous UID2 for 90 days after rotation
+- **Improved performance**: The new API uses significantly less bandwidth for the same amount of DIIs
+
+### Required Changes
+
+1. **Update dependency version**:
+   ```xml
+   <dependency>
+       <groupId>com.uid2</groupId>
+       <artifactId>uid2-client</artifactId>
+       <version>4.8.0</version>
+   </dependency>
+   ```
+
+2. **Change client class**:
+   ```java
+   // Before
+   IdentityMapClient identityMapClient = new IdentityMapClient(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
+   
+   // After
+   IdentityMapV3Client identityMapClient = new IdentityMapV3Client(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
+   ```
+
+3. **Update import statements**:
+   ```java
+   import com.uid2.client.IdentityMapV3Client;
+   import com.uid2.client.IdentityMapV3Input;
+   import com.uid2.client.IdentityMapV3Response;
+   import com.uid2.client.UnmappedIdentityReason;
+   ```
+
+### Recommended Changes
+
+1. **Update input construction**:
+   ```java
+   // Before
+   IdentityMapInput input = IdentityMapInput.fromEmails(Arrays.asList("user@example.com"));
+   
+   // After - single identity type
+   IdentityMapV3Input input = IdentityMapV3Input.fromEmails(Arrays.asList("user@example.com"));
+   
+   // Alternatively - mix identity types (new capability)
+   IdentityMapV3Input input = new IdentityMapV3Input()
+       .withEmail("user@example.com")
+       .withPhone("+12345678901");
+   ```
+
+2. **Update response handling**:
+   ```java
+   // Before
+   IdentityMapResponse response = client.generateIdentityMap(input);
+   MappedIdentity mapped = response.getMappedIdentities().get("user@example.com");
+   String uid = mapped.getRawUid();
+   
+   // After
+   IdentityMapV3Response response = client.generateIdentityMap(input);
+   IdentityMapV3Response.MappedIdentity mapped = response.getMappedIdentities().get("user@example.com");
+   String currentUid = mapped.getCurrentRawUid();
+   String previousUid = mapped.getPreviousRawUid();
+   Instant refreshFrom = mapped.getRefreshFrom();
+   ```
+
+3. **Update error handling**:
+   ```java
+   // Before
+   IdentityMapResponse.UnmappedIdentity unmapped = identityMapResponse.getUnmappedIdentities().get("user@example.com");
+   String reason = unmapped.getReason();
+   
+   // After - structured error reasons
+   IdentityMapV3Response.UnmappedIdentity unmapped = response.getUnmappedIdentities().get("user@example.com");
+   UnmappedIdentityReason reason = unmapped.getReason(); // Enum - OPTOUT, INVALID_IDENTIFIER, UNKNOWN
+   
+   // Alternatively you can get reason as a string, values match the old ones
+   String rawReason = unmapped.getRawReason();
+   ```
+
+## Previous Version (V2 Identity Map)
+
+:::note
+The V2 Identity Map SDK is an older version maintained for backwards compatibility. Migrate to the current SDK for improved performance, multi-identity type support, and better UID rotation management. 
+New integrations should not use this version. 
+See [Migration From Older Identity Map Version](#migration-from-older-identity-map-version) for instructions.
+:::
+
 1. Create an instance of IdentityMapClient as an instance variable.
    ```java
    final private IdentityMapClient identityMapClient = new IdentityMapClient(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
@@ -312,12 +485,12 @@ If you're using server-side integration (see [Publisher Integration Guide, Serve
    IdentityMapResponse identityMapResponse = identityMapClient.generateIdentityMap(IdentityMapInput.fromEmails(Arrays.asList("email1@example.com", "email2@example.com")));
    ```
 
->Note: The SDK hashes input values before sending them. This ensures that raw email addresses and phone numbers do not leave your server.
+>**Note:** The SDK hashes input values before sending them. This ensures that raw email addresses and phone numbers do not leave your server.
 
 3. Retrieve the mapped and unmapped results as follows:
    ```java
    Map<String, IdentityMapResponse.MappedIdentity> mappedIdentities = identityMapResponse.getMappedIdentities();
-   Map<String, IdentityMapResponse.UnmappedIdentity> unmappedIdentities = identityMapResponse.getUnmappedIdentities();`
+   Map<String, IdentityMapResponse.UnmappedIdentity> unmappedIdentities = identityMapResponse.getUnmappedIdentities();
    ```
 
 4. Iterate through the mapped and unmapped results, or do a lookup. The following example does a lookup:
@@ -338,7 +511,7 @@ The following instructions provide an example of how a DSP can decode <Link href
 1. Create a `BidstreamClient`:
 
 ```java
-Bidstream client = new BidstreamClient(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
+BidstreamClient client = new BidstreamClient(UID2_BASE_URL, UID2_API_KEY, UID2_SECRET_KEY);
 ```
 
 2. Refresh once at startup, and then periodically (recommended refresh interval is hourly):
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/getting-started/gs-faqs.md b/i18n/ja/docusaurus-plugin-content-docs/current/getting-started/gs-faqs.md
index 4b69a93f4..5cfef7197 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/getting-started/gs-faqs.md
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/getting-started/gs-faqs.md
@@ -10,7 +10,15 @@ import ExampleTokenInBidstream from '../snippets/_example-token-in-bidstream.mdx
 
 # Frequently Asked Questions
 
-UID2 に関するよくある質問は、以下のカテゴリーに分かれています:
+このドキュメントの UID2 に関するよくある質問は、オーディエンスごとにグループ化され、以下の一般的なカテゴリに分類されています:
+
+- [FAQs&#8212;General](#faqsgeneral)
+- [FAQs for Publishers](#faqs-for-publishers)
+- [FAQs for Advertisers and Data Providers](#faqs-for-advertisers-and-data-providers)
+- [FAQs for DSPs](#faqs-for-dsps)
+
+パブリッシャー向けの以下の追加の FAQ 情報も利用可能です:
+- [FAQs for Mobile Integrations](../guides/integration-mobile-overview.md#faqs-for-mobile-integrations)
 
 ## FAQs&#8212;General
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-ctv-guide.md b/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-ctv-guide.md
index e6179e817..3e705e702 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-ctv-guide.md
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-ctv-guide.md
@@ -13,7 +13,7 @@ import PrivateOperatorOption from '../snippets/_private-operator-option.mdx';
 
 # CTV Integration Guide
 
-CTV パブリッシャーであれば、UID2 とインテグレーションして、CTV アプリのコンテキストで RTB ビッドストリームに渡す ID トークンを生成およびリフレッシュする方法がいくつかあります。
+Connected TV (CTV) パブリッシャーであれば、UID2 とインテグレーションして、CTV アプリのコンテキストで RTB ビッドストリームに渡す ID トークンを生成およびリフレッシュする方法がいくつかあります。
 
 ## Key Integration Steps
 UID2 とインテグレーションするには、次の 3 つの主要なステップを実装します:
@@ -113,3 +113,23 @@ Server-Side コードが Java または Python である場合、UID2 SDK のい
 | :--- | :--- | :--- |
 | [Apple tvOS](https://developer.apple.com/tvos/) | [UID2 Client-Server Integration Guide for Mobile](../guides/integration-mobile-client-server.md) | [SDK for iOS Reference Guide](../sdks/sdk-ref-ios.md) |
 | [Android TV](https://www.android.com/tv/) | [UID2 Client-Server Integration Guide for Mobile](../guides/integration-mobile-client-server.md) | [SDK for Android Reference Guide](../sdks/sdk-ref-android.md) |
+
+## Best Practices
+
+CTV インテグレーションのベストプラクティスは次のとおりです:
+
+- **トークンを事前にローテーションさせる**
+
+  CTV 広告は広告ブレイク中のトラフィックスパイクに関連付けられています。これらの時間帯に UID2 Token を生成またはリフレッシュすることは理想的ではありません。忙しい時間帯の前にトークンを生成またはリフレッシュすることを勧めます。
+
+  トークンが有効期限前にリフレッシュされた場合、古いトークンが有効期限切れになるまで、新しいトークンまたは古いトークンのいずれかを使用できます。TTL (time to live) タイムスタンプは、トークンが生成またはリフレッシュされたときに UID2 Operator から返されるレスポンスボディの一部です。
+
+- **トークンは必要な場合のみローテーションさせる**
+
+  UID2 Token はユーザーの HEM (Household Email Address) または電話番号に紐付けられており、視聴セッションやアプリセッションには紐付けられていません。ユーザーに有効な UID2 Token がある限り、新しい視聴セッションやアプリセッションごとに新しいトークンを生成する必要はありません。たとえば、ユーザーがアプリを離れ、再度開いた場合、既存のトークンがまだ有効であれば、新しい UID2 Token を生成する必要はありません。
+
+- **ポッド内の複数の広告スロットで同じトークンを使用する**
+
+  UID2 Token がポッドの期間中に有効である限り、ポッド内の任意の広告スロットで使用できます。
+
+理想的には、これらのガイドラインに従うと、広告ブレイク中に新しい UID2 Token を生成する必要はありません。
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-publisher-server-side.md b/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-publisher-server-side.md
index e3bffb84f..510718e2b 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-publisher-server-side.md
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/guides/integration-publisher-server-side.md
@@ -132,8 +132,8 @@ UID2 の Opt-out ワークフローとユーザーが Opt-out する方法の詳
 
 Server-only のインテグレーションのためのサンプルアプリケーションをがあります。以下を参照してください:
 
-- [Server-Side UID2 Integration Example (sample implementation)](https://secure-signals-server-side-integ.uidapi.com/)
-- [Server-Side UID2 Integration Example (readme)](https://github.com/IABTechLab/uid2-examples/blob/main/publisher/server_only/README.md)
+- [Server-Only UID2 Integration Example](https://example-srvonly-integ.uidapi.com/login)
+- [Server-Only UID2 Integration Example (readme)](https://github.com/IABTechLab/uid2-examples/blob/main/publisher/server_only/README.md)
 
 ## FAQs
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/guides/operator-guide-aws-marketplace.md b/i18n/ja/docusaurus-plugin-content-docs/current/guides/operator-guide-aws-marketplace.md
index 91ecbfd54..8f4ba0d19 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/guides/operator-guide-aws-marketplace.md
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/guides/operator-guide-aws-marketplace.md
@@ -124,7 +124,7 @@ AWS で 1 つまたは複数の UID2 Operator をサブスクライブしてデ
 - VPC: 既存の VPC と関連する VPC サブネット ID を指定する必要があります。
 - ルートボリュームサイズ (8G Minimum)
 - SSH キー: UID2 Operator の EC2 インスタンスにアクセスする際に使用する SSH キーです。
-- [Instance type](https://aws.amazon.com/ec2/instance-types/m5/): m5.2xlarge、m5.4xlarge、といった具合です。カスタマイズがない場合は、デフォルト値の m5.2xlarge を推奨します。
+- [Instance type](https://aws.amazon.com/ec2/instance-types/): m5.2xlarge、m5.4xlarge、といった具合です。カスタマイズがない場合は、デフォルト値の m5.2xlarge を推奨します。
 
 ### Security Group Policy
 
diff --git a/i18n/ja/docusaurus-plugin-content-docs/current/ref-info/updates-doc.md b/i18n/ja/docusaurus-plugin-content-docs/current/ref-info/updates-doc.md
index 96dd9fb5a..369f31040 100644
--- a/i18n/ja/docusaurus-plugin-content-docs/current/ref-info/updates-doc.md
+++ b/i18n/ja/docusaurus-plugin-content-docs/current/ref-info/updates-doc.md
@@ -6,8 +6,8 @@ sidebar_position: 06
 ---
 
 import Link from '@docusaurus/Link';
-import CustomTagsFilters from "@site/src/components/CustomTags/CustomTagsFilters";
-import CustomTagsContainer from "@site/src/components/CustomTags/CustomTagsContainer";
+import CustomTagsFilters from '@site/src/components/CustomTags/CustomTagsFilters';
+import CustomTagsContainer from '@site/src/components/CustomTags/CustomTagsContainer';
 
 # Documentation Updates
 
@@ -16,14 +16,14 @@ import CustomTagsContainer from "@site/src/components/CustomTags/CustomTagsConta
 UID2 ドキュメンテーションリソースの最新アップデートを確認してください。
 
 :::tip
-Use the Tags toolbar to view a subset of documentation updates.
+タグツールバーを使用して、ドキュメントの更新の一部を表示できます。
 :::
 
 ## Q1 2025
 
 当四半期にリリースされたドキュメントは以下の通りです。
 
-<CustomTagsContainer tags="All, Guides, Private Operator">
+<CustomTagsContainer tags="Guides, Private Operator">
 
 ### Private Operator for AKS Integration Guide
 
@@ -37,7 +37,7 @@ UID2 <a href="../intro#participants">参加者</a> は、Azure Kubernetes Servic
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile">
+<CustomTagsContainer tags="Guides, Mobile">
 
 ### Server-Side Integration Guide for Mobile
 
@@ -51,7 +51,7 @@ March 18, 2025
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal, Sharing">
+<CustomTagsContainer tags="Portal, Sharing">
 
 ### Portal, Sharing Permissions Page
 
@@ -65,7 +65,7 @@ UID2 Portal での共有権限の設定に関するドキュメントを大幅
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, SDKs">
+<CustomTagsContainer tags="SDKs">
 
 ### JavaScript SDK Version 4
 
@@ -79,7 +79,7 @@ UID2 JavaScript SDK の最新アップデート、Version 4 に関するドキ
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### How the UID2 Token Is Created
 
@@ -93,7 +93,7 @@ UID2 Token を生成する手順に関する情報を記載したページを追
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### Snowflake Integration Guide
 
@@ -107,7 +107,7 @@ UID2 Snowflake インテグレーションを大幅に更新し、ドキュメ
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal, Reference">
+<CustomTagsContainer tags="Portal, Reference">
 
 ### Instructions for Using the UID2 Portal
 
@@ -123,7 +123,7 @@ UID2 インテグレーションガイド、SDK ドキュメント、エンド
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### Advertiser/Data Provider Doc
 
@@ -137,7 +137,7 @@ January 10, 2025
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Publisher SSO Integration Page
 
@@ -163,7 +163,7 @@ We've removed the legacy v1 to v2 upgrade doc, which is no longer needed. -->
 
 以下のドキュメントは2024年第4四半期にリリースされました。
 
-<CustomTagsContainer tags="All, Infrastructure">
+<CustomTagsContainer tags="Infrastructure">
 
 ### Zoom-In Tool for Images
 
@@ -177,7 +177,7 @@ UID2 ドキュメントサイトに、画像のズームインツールが追加
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal">
+<CustomTagsContainer tags="Portal">
 
 ### Portal Audit Trail Page
 
@@ -191,7 +191,7 @@ UID2 Portal の **Audit Trail** ページでは、Admin 権限 ([User Roles](../
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### LiveRamp Integration Tips
 
@@ -209,7 +209,7 @@ LiveRamp の Authenticated Traffic Solution (ATS) を使用して UID2 Token を
 
 以下のドキュメントは2024年第3四半期にリリースされました。
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Tokens Page
 
@@ -223,7 +223,7 @@ September 10, 2024
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Private Operator">
+<CustomTagsContainer tags="Guides, Private Operator">
 
 ### Private Operator Integration Overview
 
@@ -237,7 +237,7 @@ Private Operator のインテグレーションに関する新しいページを
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### DSP Direct Integration Instructions
 
@@ -261,7 +261,7 @@ For details, see [UID2 Tokens and Refresh Tokens]. -->
 
 <!-- APIDOCS-1958 removed 8/26/22 -->
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Integration Approaches Page
 
@@ -275,7 +275,7 @@ Client-Side、Client-Server、Server-Side の異なるインテグレーショ
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Server-Side Token Generation Page
 
@@ -289,7 +289,7 @@ Server-Side で UID2 Token を生成するパブリッシャー向けの情報
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, Prebid.js">
+<CustomTagsContainer tags="Guides, Mobile, Prebid.js">
 
 ### Integration with Prebid Mobile SDK (Android)
 
@@ -308,7 +308,7 @@ July 2, 2024
 
 以下のドキュメントは2024年第2四半期にリリースされました。
 
-<CustomTagsContainer tags="All, CTV, Guides">
+<CustomTagsContainer tags="CTV, Guides">
 
 ### CTV Integration Guide
 
@@ -322,7 +322,7 @@ UID2 とのインテグレーションを希望する CTV パブリッシャー
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Opt-Out">
+<CustomTagsContainer tags="Opt-Out">
 
 ### Opt-Out API
 
@@ -338,7 +338,7 @@ raw UID2 のリストが与えられた場合、このエンドポイントは
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### Client-Side and Server-Side Guides for Mobile
 
@@ -354,7 +354,7 @@ Android または iOS モバイルアプリのパブリッシャーが UID2 を
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal">
+<CustomTagsContainer tags="Portal">
 
 ### Portal Client-Side Integration Page
 
@@ -368,7 +368,7 @@ UID2 Portal の Client-Side Integration ページでは、ドメインなど、
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal">
+<CustomTagsContainer tags="Portal">
 
 ### Portal API Keys Page
 
@@ -382,7 +382,7 @@ UID2 Portal の API Keys ページでは、UID2 アカウントの API Key、関
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Sharing">
+<CustomTagsContainer tags="Sharing">
 
 ### Documentation for UID2 Sharing
 
@@ -402,7 +402,7 @@ April 22, 2024
 
 以下のドキュメントは2024年第1四半期にリリースされました。
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### UID2 Hashing Tool
 
@@ -416,7 +416,7 @@ March 4, 2024
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, SDKs">
+<CustomTagsContainer tags="Guides, SDKs">
 
 ### Java SDK Support, Advertiser/Data Provider
 
@@ -430,7 +430,7 @@ Java SDKは、[POST&nbsp;/identity/map](../endpoints/post-identity-map.md) エ
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Infrastructure">
+<CustomTagsContainer tags="Infrastructure">
 
 ### Audience-Specific Sidebars
 
@@ -448,7 +448,7 @@ UID2 home page の "ドキュメント" リンクをクリックするだけで
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, SDKs">
+<CustomTagsContainer tags="Guides, SDKs">
 
 ### Integration Overview for JavaScript
 
@@ -466,7 +466,7 @@ January 26, 2024
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, SDKs">
+<CustomTagsContainer tags="Guides, SDKs">
 
 ### SDK for Java, Publisher Sections
 
@@ -480,7 +480,7 @@ SDK for Java のドキュメントに、SDK を実装するパブリッシャー
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Normalization and Encoding Examples
 
@@ -494,7 +494,7 @@ January 19, 2024
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### Web Integration Overview for Publishers
 
@@ -508,7 +508,7 @@ UID2 とインテグレーションするパブリッシャーが利用できる
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Private Operator, Reference">
+<CustomTagsContainer tags="Private Operator, Reference">
 
 ### UID2 Operator Page
 
@@ -526,7 +526,7 @@ UID2 Operator が何をするのか、Public Operator と Private Operator の
 
 以下のドキュメントは2023年第4四半期にリリースされました。
 
-<CustomTagsContainer tags="All, Guides, Prebid.js">
+<CustomTagsContainer tags="Guides, Prebid.js">
 
 ### Integration Overview for Prebid
 
@@ -544,7 +544,7 @@ December 20, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Encrypt/Decrypt Examples, Java and C#
 
@@ -556,7 +556,7 @@ UID2 リクエストの暗号化とレスポンスの復号化について、追
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Private Operator">
+<CustomTagsContainer tags="Guides, Private Operator">
 
 ### Private Operator for Azure Integration Guide
 
@@ -568,7 +568,7 @@ November 30, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### API Permissions
 
@@ -580,7 +580,7 @@ UID2 ウェブサイトの Getting Started セクションに新しい記事が
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### UID2 Credentials Page
 
@@ -592,7 +592,7 @@ November 21, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, SDKs">
+<CustomTagsContainer tags="Guides, SDKs">
 
 ### Client-Side Integration Guide for JS
 
@@ -610,7 +610,7 @@ Client-Side Integration Guide for JavaScript は、既存の URL の全く新し
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Prebid.js">
+<CustomTagsContainer tags="Guides, Prebid.js">
 
 ### Client-Side Integration Guide for Prebid.js
 
@@ -629,7 +629,7 @@ UID2 Client-Side Integration Guide for Prebid.js は、既存の URL にまっ
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Opt-Out, Reference">
+<CustomTagsContainer tags="Opt-Out, Reference">
 
 ### Opt-Out Page
 
@@ -641,7 +641,7 @@ October 31, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides">
+<CustomTagsContainer tags="Guides">
 
 ### AWS Entity Resolution Integration Guide
 
@@ -655,7 +655,7 @@ October 19, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, SDKs">
+<CustomTagsContainer tags="Guides, SDKs">
 
 ### SDK for JavaScript Version 3 
 
@@ -673,7 +673,7 @@ SDK for JavaScript Version 3 の機能強化に伴い、ドキュメントが大
 
 以下のドキュメントは2023年第3四半期にリリースされました。
 
-<CustomTagsContainer tags="All, Guides, Private Operator">
+<CustomTagsContainer tags="Guides, Private Operator">
 
 ### Private Operator Guide for Google Confidential Space 
 
@@ -687,7 +687,7 @@ September 30, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Reference">
+<CustomTagsContainer tags="Reference">
 
 ### Normalization and Encoding Rules
 
@@ -702,7 +702,7 @@ September 7, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### IMA Mobile Plugin for Android
 
@@ -714,7 +714,7 @@ Android 向け UID2 Interactive Media Ads(IMA)Plugin に関する情報を提供
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### IMA Mobile Plugin for iOS
 
@@ -726,7 +726,7 @@ iOS 向け UID2 Interactive Media Ads(IMA)Plugin に関する情報を提供す
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### GMA Mobile Plugin for Android
 
@@ -738,7 +738,7 @@ Android 向け UID2 Google Mobile Ads(GMA)Plugin に関する情報を提供す
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### GMA Mobile Plugin for iOS
 
@@ -750,7 +750,7 @@ iOS 向け UID2 Google Mobile Ads(GMA)Plugin に関する情報を提供する
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Infrastructure">
+<CustomTagsContainer tags="Infrastructure">
 
 ### UID2 Website in Japanese
 
@@ -762,7 +762,7 @@ UID2 のウェブサイト全体が、英語だけでなく日本語でも利用
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Portal">
+<CustomTagsContainer tags="Portal">
 
 ### Portal Documentation
 
@@ -774,7 +774,7 @@ UID2 アカウントを管理できる新しい UID2 Portal ユーザーイン
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Sharing, SDKs">
+<CustomTagsContainer tags="Guides, Sharing, SDKs">
 
 ### Documentation for UID2 Sharing
 
@@ -794,7 +794,7 @@ August 3, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### Android SDK Guide
 
@@ -806,7 +806,7 @@ August 3, 2023
 
 </CustomTagsContainer>
 
-<CustomTagsContainer tags="All, Guides, Mobile, SDKs">
+<CustomTagsContainer tags="Guides, Mobile, SDKs">
 
 ### iOS SDK Guide
 
diff --git a/static/examples/cstg-prebid-example/index.html b/static/examples/cstg-prebid-example/index.html
index 339452cf4..390194423 100644
--- a/static/examples/cstg-prebid-example/index.html
+++ b/static/examples/cstg-prebid-example/index.html
@@ -109,6 +109,9 @@
     <h1>UID2 Prebid.js Client-Side Integration Example</h1>
     <p class="intro">
       This example demonstrates how a content publisher can integrate with UID2 and Prebid.js using the <a href="https://unifiedid.com/docs/guides/integration-prebid-client-side">UID2 Client-Side Integration Guide for Prebid.js</a>, which includes generating UID2 tokens within the browser.
+      <strong>Note:</strong> This is a <em>test-only</em> integration environment—not for production use.
+      It does not perform real user authentication or generate production-level tokens.
+      Do not use real user data on this page.
     </p>
     <table id="uid2_state">
       <tr>
@@ -133,11 +136,11 @@ <h1>UID2 Prebid.js Client-Side Integration Example</h1>
           value="test@example.com"
         />
       </div>
-      <div><button type="button" class="button" id="login">Log In</button></div>
+      <div><button type="button" class="button" id="login">Generate UID2</button></div>
     </div>
     <div id="clear_storage_form" style="display: none" class="form">
       <form>
-        <button type="button" class="button" id="clear_storage">Clear Storage</button>
+        <button type="button" class="button" id="clear_storage">Clear UID2</button>
       </form>
     </div>
     </div>