diff --git a/pkg/datadogunifi/integration_test_expectations.yaml b/pkg/datadogunifi/integration_test_expectations.yaml
index fa03e22f..2adb4a3b 100644
--- a/pkg/datadogunifi/integration_test_expectations.yaml
+++ b/pkg/datadogunifi/integration_test_expectations.yaml
@@ -372,6 +372,49 @@ gauges:
   - unifi.ubb.uplink_uptime
   - unifi.usg.uplink_max_speed
   - unifi.usg.uplink_uptime
+  - unifi.ubb.stat_rx_frags
+  - unifi.uci.stat_tx_retries
+  - unifi.uci.stat_rx_bytes
+  - unifi.ubb.stat_rx_errors
+  - unifi.uci.mem_total
+  - unifi.ubb.stat_rx_packets
+  - unifi.uci.sys
+  - unifi.uci.bytes
+  - unifi.uci.stat_bytes
+  - unifi.uci.stat_rx_errors
+  - unifi.ubb.stat_tx_bytes
+  - unifi.uci.rx_bytes
+  - unifi.uci.mem_used
+  - unifi.uci.probe
+  - unifi.uci.memory
+  - unifi.uci.mem_buffer
+  - unifi.uci.uptime
+  - unifi.ubb.stat_tx_packets
+  - unifi.ubb.stat_tx_retries
+  - unifi.uci.stat_rx_frags
+  - unifi.ubb.stat_rx_crypts
+  - unifi.ubb.stat_tx_dropped
+  - unifi.ubb.stat_rx_dropped
+  - unifi.ubb.stat_bytes
+  - unifi.uci.mem
+  - unifi.uci.stat_rx_crypts
+  - unifi.uci.last_seen
+  - unifi.ubb.stat_rx_bytes
+  - unifi.uci.stat_rx_dropped
+  - unifi.uci.system_uptime
+  - unifi.uci.stat_tx_errors
+  - unifi.uci.network
+  - unifi.ubb.stat_tx_errors
+  - unifi.uci.loadavg_1
+  - unifi.uci.loadavg_5
+  - unifi.uci.cpu
+  - unifi.uci.stat_tx_bytes
+  - unifi.uci.stat_tx_packets
+  - unifi.uci.loadavg_15
+  - unifi.uci.tx_bytes
+  - unifi.uci.stat_rx_packets
+  - unifi.uci.stat_tx_dropped
+  - unifi.uci.state
 counts:
   - unifi.collector.num_devices
   - unifi.collector.num_errors
diff --git a/pkg/datadogunifi/ubb.go b/pkg/datadogunifi/ubb.go
index ad82c65b..e1e5ab7e 100644
--- a/pkg/datadogunifi/ubb.go
+++ b/pkg/datadogunifi/ubb.go
@@ -85,7 +85,7 @@ func (u *DatadogUnifi) batchUBB(r report, s *unifi.UBB) { // nolint: funlen
 			"uptime":    s.Uptime.Val,
 		})
 
-	metricName = metricNamespace("usw")
+	metricName = metricNamespace("ubb")
 	reportGaugeForFloat64Map(r, metricName, data, tags)
 }
 
diff --git a/pkg/datadogunifi/uci.go b/pkg/datadogunifi/uci.go
index 74d520d8..7a685084 100644
--- a/pkg/datadogunifi/uci.go
+++ b/pkg/datadogunifi/uci.go
@@ -56,7 +56,7 @@ func (u *DatadogUnifi) batchUCI(r report, s *unifi.UCI) { // nolint: funlen
 
 	r.addCount(uciT)
 
-	metricName := metricNamespace("usg")
+	metricName := metricNamespace("uci")
 	reportGaugeForFloat64Map(r, metricName, data, tags)
 
 	tags = cleanTags(map[string]string{
@@ -80,6 +80,6 @@ func (u *DatadogUnifi) batchUCI(r report, s *unifi.UCI) { // nolint: funlen
 			"uptime":    s.Uptime.Val,
 		})
 
-	metricName = metricNamespace("usw")
+	metricName = metricNamespace("uci")
 	reportGaugeForFloat64Map(r, metricName, data, tags)
 }
diff --git a/pkg/influxunifi/integration_test_expectations.yaml b/pkg/influxunifi/integration_test_expectations.yaml
index 2be4af83..7f63aad1 100644
--- a/pkg/influxunifi/integration_test_expectations.yaml
+++ b/pkg/influxunifi/integration_test_expectations.yaml
@@ -402,9 +402,19 @@ points:
       - version
     fields:
       bytes: float
+      cpu: float
       ip: string
       last_seen: float
+      license_state: string
+      loadavg_1: float
+      loadavg_5: float
+      loadavg_15: float
+      mem: float
+      mem_buffer: float
+      mem_total: float
+      mem_used: float
       rx_bytes: float
+      source: string
       stat_bytes: float
       stat_rx_bytes: float
       stat_rx_crypts: float
@@ -417,8 +427,68 @@ points:
       stat_tx_errors: float
       stat_tx_packets: float
       stat_tx_retries: float
+      state: float
+      system_uptime: float
+      temp_cpu: int
+      temp_memory: int
+      temp_network: int
+      temp_probe: int
+      temp_sys: int
+      tx_bytes: float
+      uplink_latency: float
+      uplink_max_speed: float
+      uplink_speed: float
+      uplink_uptime: float
+      uptime: float
+      user-num_sta: float
+      version: string
+  uci:
+    tags:
+      - mac
+      - model
+      - name
+      - serial
+      - site_name
+      - source
+      - type
+      - version
+    fields:
+      bytes: float
+      cpu: float
+      ip: string
+      last_seen: float
+      license_state: string
+      loadavg_1: float
+      loadavg_5: float
+      loadavg_15: float
+      mem: float
+      mem_buffer: float
+      mem_total: float
+      mem_used: float
+      rx_bytes: float
+      source: string
+      stat_bytes: float
+      stat_rx_bytes: float
+      stat_rx_crypts: float
+      stat_rx_dropped: float
+      stat_rx_errors: float
+      stat_rx_frags: float
+      stat_rx_packets: float
+      stat_tx_bytes: float
+      stat_tx_dropped: float
+      stat_tx_errors: float
+      stat_tx_packets: float
+      stat_tx_retries: float
+      state: float
+      system_uptime: float
+      temp_cpu: int
+      temp_memory: int
+      temp_network: int
+      temp_probe: int
+      temp_sys: int
       tx_bytes: float
       uptime: float
+      version: string
   unifi_alarm:
     tags:
       - action
diff --git a/pkg/influxunifi/ubb.go b/pkg/influxunifi/ubb.go
index 7093e4f1..2a63d893 100644
--- a/pkg/influxunifi/ubb.go
+++ b/pkg/influxunifi/ubb.go
@@ -62,7 +62,7 @@ func (u *InfluxUnifi) batchUBB(r report, s *unifi.UBB) { // nolint: funlen
 	)
 
 	r.addCount(ubbT)
-	r.send(&metric{Table: "usg", Tags: tags, Fields: fields})
+	r.send(&metric{Table: "ubb", Tags: tags, Fields: fields})
 
 	tags = map[string]string{
 		"mac":       s.Mac,
diff --git a/pkg/influxunifi/uci.go b/pkg/influxunifi/uci.go
index 04a17bb4..83486c8f 100644
--- a/pkg/influxunifi/uci.go
+++ b/pkg/influxunifi/uci.go
@@ -57,7 +57,7 @@ func (u *InfluxUnifi) batchUCI(r report, s *unifi.UCI) { // nolint: funlen
 	)
 
 	r.addCount(uciT)
-	r.send(&metric{Table: "usg", Tags: tags, Fields: fields})
+	r.send(&metric{Table: "uci", Tags: tags, Fields: fields})
 
 	tags = map[string]string{
 		"mac":       s.Mac,
@@ -80,5 +80,5 @@ func (u *InfluxUnifi) batchUCI(r report, s *unifi.UCI) { // nolint: funlen
 			"uptime":    s.Uptime.Val,
 		})
 
-	r.send(&metric{Table: "usw", Tags: tags, Fields: fields})
+	r.send(&metric{Table: "uci", Tags: tags, Fields: fields})
 }