diff --git a/device-types/APC/AP7830.yaml b/device-types/APC/AP7830.yaml
new file mode 100644
index 000000000..d4c6e1831
--- /dev/null
+++ b/device-types/APC/AP7830.yaml
@@ -0,0 +1,112 @@
+manufacturer: APC
+model: AP7830
+slug: ap7830
+# comments: Rack PDU, Metered, Zero U, 20A, 120V, (24) NEMA 5-20R
+u_height: 0
+console-ports:
+  - name: Serial
+    type: rj-12
+power-ports:
+  - name: Power Port 1
+    type: nema-l5-20p
+power-outlets:
+  - name: Power Outlet 1
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 2
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 3
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 4
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 5
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 6
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 7
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 8
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 9
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 10
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 11
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 12
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 13
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 14
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 15
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 16
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 17
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 18
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 19
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 20
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 21
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 22
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 23
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+  - name: Power Outlet 24
+    type: nema-5-20r
+    power_port: Power Port 1
+    feed_leg: A
+interfaces:
+  - name: Network
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/APC/AP8932.yaml b/device-types/APC/AP8932.yaml
index 84dbe769c..a123e25d0 100644
--- a/device-types/APC/AP8932.yaml
+++ b/device-types/APC/AP8932.yaml
@@ -90,10 +90,6 @@ power-outlets:
     type: nema-5-20r
     power_port: Power Port 1
     feed_leg: A
-  - name: Power Outlet 20
-    type: nema-5-20r
-    power_port: Power Port 1
-    feed_leg: A
   - name: Power Outlet 21
     type: nema-5-20r
     power_port: Power Port 1