diff --git a/src/components/SuiteHeader/SuiteHeader.jsx b/src/components/SuiteHeader/SuiteHeader.jsx
index b29673c1a4..bf92b912f9 100644
--- a/src/components/SuiteHeader/SuiteHeader.jsx
+++ b/src/components/SuiteHeader/SuiteHeader.jsx
@@ -222,9 +222,14 @@ const SuiteHeader = ({
           <>
             <span
               className={`${settings.iotPrefix}--suite-header-data`}
-              data-workspace-id={routes.workspaceId}
-              data-domain={routes.domain}
-            />
+              data-type="workspaceId">
+              {routes.workspaceId}
+            </span>
+            <span
+              className={`${settings.iotPrefix}--suite-header-data`}
+              data-type="domain">
+              {routes.domain}
+            </span>
             <Header
               className={[`${settings.iotPrefix}--suite-header`, className]
                 .filter((i) => i)
diff --git a/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot b/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
index e6534c8a04..ff3612d51f 100644
--- a/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
+++ b/src/components/SuiteHeader/__snapshots__/SuiteHeader.story.storyshot
@@ -108,6 +108,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Suite
     </div>
     <span
       className="iot--suite-header-data"
+      data-type="workspaceId"
+    />
+    <span
+      className="iot--suite-header-data"
+      data-type="domain"
     />
     <header
       aria-label="main header"
@@ -872,6 +877,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Suite
     </div>
     <span
       className="iot--suite-header-data"
+      data-type="workspaceId"
+    />
+    <span
+      className="iot--suite-header-data"
+      data-type="domain"
     />
     <header
       aria-label="main header"
@@ -1832,6 +1842,11 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Suite
     </div>
     <span
       className="iot--suite-header-data"
+      data-type="workspaceId"
+    />
+    <span
+      className="iot--suite-header-data"
+      data-type="domain"
     />
     <header
       aria-label="main header"
@@ -2393,9 +2408,16 @@ exports[`Storybook Snapshot tests and console checks Storyshots Watson IoT/Suite
     </div>
     <span
       className="iot--suite-header-data"
-      data-domain="ibm.com"
-      data-workspace-id="workspace1"
-    />
+      data-type="workspaceId"
+    >
+      workspace1
+    </span>
+    <span
+      className="iot--suite-header-data"
+      data-type="domain"
+    >
+      ibm.com
+    </span>
     <header
       aria-label="main header"
       className="bx--header iot--suite-header"