diff --git a/Makefile b/Makefile
index 8469a694b2008..9432016c27e55 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ PKG_MODS := $(shell find ./pkg/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
 CMD_MODS_0 := $(shell find ./cmd/[a-z]* $(FIND_MOD_ARGS) -not -path "./cmd/otel*col/*" -exec $(TO_MOD_DIR) )
 CMD_MODS := $(CMD_MODS_0)
 OTHER_MODS := $(shell find . $(EX_COMPONENTS) $(EX_INTERNAL) $(EX_PKG) $(EX_CMD) $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
-ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(CMD_MODS) $(OTHER_MODS)
+export ALL_MODS := $(RECEIVER_MODS) $(PROCESSOR_MODS) $(EXPORTER_MODS) $(EXTENSION_MODS) $(CONNECTOR_MODS) $(INTERNAL_MODS) $(PKG_MODS) $(CMD_MODS) $(OTHER_MODS)
 
 CGO_MODS := ./receiver/hostmetricsreceiver
 
@@ -222,7 +222,7 @@ goporto: $(PORTO)
 
 .PHONY: for-all
 for-all:
-	@set -e; for dir in $${ALL_MODS}; do \
+	@set -e; for dir in $$ALL_MODS; do \
 	  (cd "$${dir}" && \
 	  	echo "running $${CMD} in $${dir}" && \
 	 	$${CMD} ); \
diff --git a/receiver/ciscoosreceiver/documentation.md b/receiver/ciscoosreceiver/documentation.md
index 4c60efe83f708..aa54edd44717f 100644
--- a/receiver/ciscoosreceiver/documentation.md
+++ b/receiver/ciscoosreceiver/documentation.md
@@ -18,7 +18,7 @@ Number of bytes received on the interface
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| bytes | Gauge | Int |
+| By | Gauge | Int |
 
 #### Attributes
 
@@ -33,7 +33,7 @@ Number of receive errors on the interface
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| errors | Gauge | Int |
+| {error} | Gauge | Int |
 
 #### Attributes
 
@@ -48,7 +48,7 @@ Number of bytes transmitted on the interface
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| bytes | Gauge | Int |
+| By | Gauge | Int |
 
 #### Attributes
 
@@ -63,7 +63,7 @@ Number of transmit errors on the interface
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| errors | Gauge | Int |
+| {error} | Gauge | Int |
 
 #### Attributes
 
@@ -89,19 +89,19 @@ Interface operational status (1 for up, 0 for down)
 
 ### cisco.system.cpu.utilization
 
-CPU utilization percentage
+CPU utilization as a fraction
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| % | Gauge | Double |
+| 1 | Gauge | Double |
 
 ### cisco.system.memory.utilization
 
-Memory utilization percentage
+Memory utilization as a fraction
 
 | Unit | Metric Type | Value Type |
 | ---- | ----------- | ---------- |
-| % | Gauge | Double |
+| 1 | Gauge | Double |
 
 ## Resource Attributes
 
diff --git a/receiver/ciscoosreceiver/internal/metadata/generated_metrics.go b/receiver/ciscoosreceiver/internal/metadata/generated_metrics.go
index 7b74dbc4b77dd..1e1520ee4490e 100644
--- a/receiver/ciscoosreceiver/internal/metadata/generated_metrics.go
+++ b/receiver/ciscoosreceiver/internal/metadata/generated_metrics.go
@@ -60,7 +60,7 @@ type metricCiscoInterfaceReceiveBytes struct {
 func (m *metricCiscoInterfaceReceiveBytes) init() {
 	m.data.SetName("cisco.interface.receive.bytes")
 	m.data.SetDescription("Number of bytes received on the interface")
-	m.data.SetUnit("bytes")
+	m.data.SetUnit("By")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
 }
@@ -112,7 +112,7 @@ type metricCiscoInterfaceReceiveErrors struct {
 func (m *metricCiscoInterfaceReceiveErrors) init() {
 	m.data.SetName("cisco.interface.receive.errors")
 	m.data.SetDescription("Number of receive errors on the interface")
-	m.data.SetUnit("errors")
+	m.data.SetUnit("{error}")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
 }
@@ -164,7 +164,7 @@ type metricCiscoInterfaceTransmitBytes struct {
 func (m *metricCiscoInterfaceTransmitBytes) init() {
 	m.data.SetName("cisco.interface.transmit.bytes")
 	m.data.SetDescription("Number of bytes transmitted on the interface")
-	m.data.SetUnit("bytes")
+	m.data.SetUnit("By")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
 }
@@ -216,7 +216,7 @@ type metricCiscoInterfaceTransmitErrors struct {
 func (m *metricCiscoInterfaceTransmitErrors) init() {
 	m.data.SetName("cisco.interface.transmit.errors")
 	m.data.SetDescription("Number of transmit errors on the interface")
-	m.data.SetUnit("errors")
+	m.data.SetUnit("{error}")
 	m.data.SetEmptyGauge()
 	m.data.Gauge().DataPoints().EnsureCapacity(m.capacity)
 }
@@ -319,8 +319,8 @@ type metricCiscoSystemCPUUtilization struct {
 // init fills cisco.system.cpu.utilization metric with initial data.
 func (m *metricCiscoSystemCPUUtilization) init() {
 	m.data.SetName("cisco.system.cpu.utilization")
-	m.data.SetDescription("CPU utilization percentage")
-	m.data.SetUnit("%")
+	m.data.SetDescription("CPU utilization as a fraction")
+	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 }
 
@@ -368,8 +368,8 @@ type metricCiscoSystemMemoryUtilization struct {
 // init fills cisco.system.memory.utilization metric with initial data.
 func (m *metricCiscoSystemMemoryUtilization) init() {
 	m.data.SetName("cisco.system.memory.utilization")
-	m.data.SetDescription("Memory utilization percentage")
-	m.data.SetUnit("%")
+	m.data.SetDescription("Memory utilization as a fraction")
+	m.data.SetUnit("1")
 	m.data.SetEmptyGauge()
 }
 
diff --git a/receiver/ciscoosreceiver/internal/metadata/generated_metrics_test.go b/receiver/ciscoosreceiver/internal/metadata/generated_metrics_test.go
index eb96c1fadb7b3..d06f12846463a 100644
--- a/receiver/ciscoosreceiver/internal/metadata/generated_metrics_test.go
+++ b/receiver/ciscoosreceiver/internal/metadata/generated_metrics_test.go
@@ -128,7 +128,7 @@ func TestMetricsBuilder(t *testing.T) {
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
 					assert.Equal(t, "Number of bytes received on the interface", ms.At(i).Description())
-					assert.Equal(t, "bytes", ms.At(i).Unit())
+					assert.Equal(t, "By", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())
@@ -146,7 +146,7 @@ func TestMetricsBuilder(t *testing.T) {
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
 					assert.Equal(t, "Number of receive errors on the interface", ms.At(i).Description())
-					assert.Equal(t, "errors", ms.At(i).Unit())
+					assert.Equal(t, "{error}", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())
@@ -164,7 +164,7 @@ func TestMetricsBuilder(t *testing.T) {
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
 					assert.Equal(t, "Number of bytes transmitted on the interface", ms.At(i).Description())
-					assert.Equal(t, "bytes", ms.At(i).Unit())
+					assert.Equal(t, "By", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())
@@ -182,7 +182,7 @@ func TestMetricsBuilder(t *testing.T) {
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
 					assert.Equal(t, "Number of transmit errors on the interface", ms.At(i).Description())
-					assert.Equal(t, "errors", ms.At(i).Unit())
+					assert.Equal(t, "{error}", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())
@@ -217,8 +217,8 @@ func TestMetricsBuilder(t *testing.T) {
 					validatedMetrics["cisco.system.cpu.utilization"] = true
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
-					assert.Equal(t, "CPU utilization percentage", ms.At(i).Description())
-					assert.Equal(t, "%", ms.At(i).Unit())
+					assert.Equal(t, "CPU utilization as a fraction", ms.At(i).Description())
+					assert.Equal(t, "1", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())
@@ -229,8 +229,8 @@ func TestMetricsBuilder(t *testing.T) {
 					validatedMetrics["cisco.system.memory.utilization"] = true
 					assert.Equal(t, pmetric.MetricTypeGauge, ms.At(i).Type())
 					assert.Equal(t, 1, ms.At(i).Gauge().DataPoints().Len())
-					assert.Equal(t, "Memory utilization percentage", ms.At(i).Description())
-					assert.Equal(t, "%", ms.At(i).Unit())
+					assert.Equal(t, "Memory utilization as a fraction", ms.At(i).Description())
+					assert.Equal(t, "1", ms.At(i).Unit())
 					dp := ms.At(i).Gauge().DataPoints().At(0)
 					assert.Equal(t, start, dp.StartTimestamp())
 					assert.Equal(t, ts, dp.Timestamp())