diff --git a/CHANGELOG.md b/CHANGELOG.md
index 073dcec25..37fb30d3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed Memory Circuit Breaker flaky error in ML APIs ([#788](https://github.com/opensearch-project/opensearch-api-specification/pull/788))
 - Fixed GeoDistanceSort schema ([#805](https://github.com/opensearch-project/opensearch-api-specification/pull/805))
 - Fixed Aggregation schemas([#801](https://github.com/opensearch-project/opensearch-api-specification/pull/801))
+- Fixed swapped schema references in nodes info API buffer fields([#808](https://github.com/opensearch-project/opensearch-api-specification/pull/808))
 
 ### Changed
 - Changed `tasks._common:TaskInfo` and `tasks._common:TaskGroup` to be composed of a `tasks._common:TaskInfoBase` ([#683](https://github.com/opensearch-project/opensearch-api-specification/pull/683))
diff --git a/spec/schemas/nodes.info.yaml b/spec/schemas/nodes.info.yaml
index e9dd2955c..b70c9f231 100644
--- a/spec/schemas/nodes.info.yaml
+++ b/spec/schemas/nodes.info.yaml
@@ -64,12 +64,17 @@ components:
           type: object
           additionalProperties:
             $ref: '#/components/schemas/NodeThreadPoolInfo'
-        # NOTE: total_indexing_buffer and total_indexing_buffer_in_bytes inverted according to the standard pattern, this is a bug: https://github.com/opensearch-project/OpenSearch/issues/16910
         total_indexing_buffer:
           description: Total heap allowed to be used to hold recently indexed documents before they must be written to disk. This size is a shared pool across all shards on this node, and is controlled by Indexing Buffer settings.
-          $ref: '_common.yaml#/components/schemas/ByteCount'
+          # NOTE: In OpenSearch 3.0, this field will change from ByteCount to HumanReadableByteCount
+          oneOf:
+            - $ref: '_common.yaml#/components/schemas/ByteCount'
+            - $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
         total_indexing_buffer_in_bytes:
-          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
+          # NOTE: In OpenSearch 3.0, this field will change from HumanReadableByteCount to ByteCount
+          oneOf:
+            - $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
+            - $ref: '_common.yaml#/components/schemas/ByteCount'
         transport:
           $ref: '#/components/schemas/NodeInfoTransport'
         transport_address: