diff --git a/conf/rest/9.12.0/netport.yaml b/conf/rest/9.12.0/netport.yaml
index 87771d832..8e8be1905 100644
--- a/conf/rest/9.12.0/netport.yaml
+++ b/conf/rest/9.12.0/netport.yaml
@@ -12,12 +12,34 @@ counters:
   - ^lag.distribution_policy                 => lag_distribution_policy
   - ^lag.mode                                => lag_mode
   - ^operational_speed                       => op_speed
+  - ^speed                                   => speed
   - ^state                                   => status
+  - ^type                                    => port_type
   - ^vlan.base_port.name                     => vlan_port
   - ^vlan.base_port.node.name                => vlan_node
   - ^vlan.tag                                => vlan_id
   - mtu                                      => mtu
 
+endpoints:
+  - query: api/private/cli/network/port
+    counters:
+      - ^^node                               => node
+      - ^^port                               => port
+      - ^duplex_admin                        => admin_duplex
+      - ^duplex_oper                         => op_duplex
+      - ^flowcontrol_admin                   => admin_flowcontrol
+      - ^role                                => role
+      - ^speed_admin                         => admin_speed
+  - query: api/private/cli/network/port/ifgrp
+    counters:
+      - ^^ifgrp                              => port
+      - ^^node                               => node
+      - ^activeports                         => activeports
+      - ^distr_func                          => ifgrp_func
+      - ^down_ports                          => down_ports
+      - ^ports                               => ports
+      - ^up_ports                            => up_ports
+
 plugins:
   LabelAgent:
     value_to_num:
diff --git a/conf/rest/9.12.0/port.yaml b/conf/rest/9.12.0/port.yaml
deleted file mode 100644
index d9df2bfdf..000000000
--- a/conf/rest/9.12.0/port.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name:   Port
-query:  api/network/ethernet/ports
-object: net_port
-
-counters:
-    - ^^name                      => port
-    - ^^node.name                 => node
-    - ^broadcast_domain.name      => broadcast_domain
-    - ^lag.distribution_policy    => ifgrp_distribution_policy
-    - ^lag.mode                   => ifgrp_mode
-    - ^speed                      => speed
-    - ^state                      => state
-    - ^type                       => port_type
-    - ^vlan.base_port.name        => vlan_port
-    - ^vlan.base_port.node.name   => vlan_node
-    - ^vlan.tag                   => vlan_id
-
-endpoints:
-  - query: api/private/cli/network/port
-    counters:
-      - ^^node                    => node
-      - ^^port                    => port
-      - ^duplex_admin             => admin_duplex
-      - ^duplex_oper              => op_duplex
-      - ^flowcontrol_admin        => admin_flowcontrol
-      - ^role                     => role
-      - ^speed_admin              => admin_speed
-  - query: api/private/cli/network/port/ifgrp
-    counters:
-      - ^^ifgrp                   => port
-      - ^^node                    => node
-      - ^activeports              => activeports
-      - ^distr_func               => ifgrp_func
-      - ^down_ports               => down_ports
-      - ^ports                    => ports
-      - ^up_ports                 => up_ports
-
-plugins:
-  LabelAgent:
-    value_to_num: status state up up `0`
-
-export_options:
-  include_all_labels: true
\ No newline at end of file
diff --git a/conf/rest/default.yaml b/conf/rest/default.yaml
index 823b8db28..e7eb8114b 100644
--- a/conf/rest/default.yaml
+++ b/conf/rest/default.yaml
@@ -26,7 +26,6 @@ objects:
   NtpServer:                   ntpserver.yaml
   OntapS3:                     ontap_s3.yaml
   OntapS3Policy:               ontap_s3_policy.yaml
-  Port:                        port.yaml
   QosPolicyAdaptive:           qos_policy_adaptive.yaml
   QosPolicyFixed:              qos_policy_fixed.yaml
   Qtree:                       qtree.yaml