diff --git a/src/gam/gapi/directory/cros.py b/src/gam/gapi/directory/cros.py
index d258d862..f7fc2268 100644
--- a/src/gam/gapi/directory/cros.py
+++ b/src/gam/gapi/directory/cros.py
@@ -304,6 +304,8 @@ def doGetCrosInfo():
         if 'autoUpdateExpiration' in cros:
             cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                 cros['autoUpdateExpiration'])
+        if 'orgUnitId' in cros:
+            cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
         _checkTPMVulnerability(cros)
         for up in CROS_SCALAR_PROPERTY_PRINT_ORDER:
             if up in cros:
@@ -739,6 +741,8 @@ def doPrintCrosDevices():
                 if 'autoUpdateExpiration' in cros:
                     cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                         cros['autoUpdateExpiration'])
+                if 'orgUnitId' in cros:
+                    cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
                 for cpuStatusReport in cros.get('cpuStatusReports', []):
                     tempInfos = cpuStatusReport.get('cpuTemperatureInfo', [])
                     for tempInfo in tempInfos:
@@ -753,6 +757,8 @@ def doPrintCrosDevices():
             if 'autoUpdateExpiration' in cros:
                 cros['autoUpdateExpiration'] = utils.formatTimestampYMD(
                     cros['autoUpdateExpiration'])
+            if 'orgUnitId' in cros:
+                cros['orgUnitId'] = f"id:{cros['orgUnitId']}"
             row = {}
             for attrib in cros:
                 if attrib not in {
diff --git a/src/gam/var.py b/src/gam/var.py
index 010e40c0..e4bfedc6 100644
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -988,6 +988,7 @@ CROS_ARGUMENT_TO_PROPERTY_MAP = {
     'notes': ['notes',],
     'ordernumber': ['orderNumber',],
     'org': ['orgUnitPath',],
+    'orgunitid': ['orgUnitId',],
     'orgunitpath': ['orgUnitPath',],
     'osversion': ['osVersion',],
     'ou': ['orgUnitPath',],
@@ -1013,6 +1014,7 @@ CROS_BASIC_FIELDS_LIST = [
 ]
 
 CROS_SCALAR_PROPERTY_PRINT_ORDER = [
+    'orgUnitId',
     'orgUnitPath',
     'annotatedAssetId',
     'annotatedLocation',