diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cab91e04..30c1ae47a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -123,6 +123,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed FilterQueryRequestProcessor to use correct query type ([#821](https://github.com/opensearch-project/opensearch-api-specification/pull/821))
 - Fixed `knn.train_model`'s request body `method` field to accept an object rather than a string ([#814](https://github.com/opensearch-project/opensearch-api-specification/pull/814))
 - Fixed REST status codes for RBAC and provisioning for Flow Framework plugin ([#842](https://github.com/opensearch-project/opensearch-api-specification/pull/842))
+- 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..2f00c3d50 100644
--- a/spec/schemas/nodes.info.yaml
+++ b/spec/schemas/nodes.info.yaml
@@ -64,12 +64,19 @@ 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'
+          oneOf:
+            - $ref: '_common.yaml#/components/schemas/ByteCount'
+              x-version-removed: '3.0'
+            - $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
+              x-version-added: '3.0'
         total_indexing_buffer_in_bytes:
-          $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
+          oneOf:
+            - $ref: '_common.yaml#/components/schemas/HumanReadableByteCount'
+              x-version-removed: '3.0'
+            - $ref: '_common.yaml#/components/schemas/ByteCount'
+              x-version-added: '3.0'
         transport:
           $ref: '#/components/schemas/NodeInfoTransport'
         transport_address: