diff --git a/doc/v3/api_samples/server-ips/server-ips-network-resp.json b/doc/v3/api_samples/server-ips/server-ips-network-resp.json
index 0f8831da64a8..8669202e745a 100644
--- a/doc/v3/api_samples/server-ips/server-ips-network-resp.json
+++ b/doc/v3/api_samples/server-ips/server-ips-network-resp.json
@@ -2,8 +2,6 @@
     "private": [
         {
             "addr": "192.168.0.3",
-            "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-            "OS-EXT-IPS:type": "fixed",
             "version": 4
         }
     ]
diff --git a/doc/v3/api_samples/server-ips/server-ips-resp.json b/doc/v3/api_samples/server-ips/server-ips-resp.json
index f1bfb4d679ab..8a3500561399 100644
--- a/doc/v3/api_samples/server-ips/server-ips-resp.json
+++ b/doc/v3/api_samples/server-ips/server-ips-resp.json
@@ -3,8 +3,6 @@
         "private": [
             {
                 "addr": "192.168.0.3",
-                "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-                "OS-EXT-IPS:type": "fixed",
                 "version": 4
             }
         ]
diff --git a/nova/api/openstack/compute/plugins/v3/ips.py b/nova/api/openstack/compute/plugins/v3/ips.py
index adcafdeddd67..87998c13126a 100644
--- a/nova/api/openstack/compute/plugins/v3/ips.py
+++ b/nova/api/openstack/compute/plugins/v3/ips.py
@@ -28,8 +28,11 @@ authorize = extensions.os_compute_authorizer(ALIAS)
 
 class IPsController(wsgi.Controller):
     """The servers addresses API controller for the OpenStack API."""
-
-    _view_builder_class = views_addresses.ViewBuilderV3
+    # Note(gmann): here using V2 view builder instead of V3 to have V2.1
+    # server ips response same as V2 which does not include "OS-EXT-IPS:type"
+    # & "OS-EXT-IPS-MAC:mac_addr". If needed those can be added with
+    # microversion by using V3 view builder.
+    _view_builder_class = views_addresses.ViewBuilder
 
     def __init__(self, **kwargs):
         super(IPsController, self).__init__(**kwargs)
diff --git a/nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl b/nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl
index 404649a36e3c..29d2370a7441 100644
--- a/nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/server-ips/server-ips-network-resp.json.tpl
@@ -2,8 +2,6 @@
     "private": [
         {
             "addr": "%(ip)s",
-            "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-            "OS-EXT-IPS:type": "fixed",
             "version": 4
         }
     ]
diff --git a/nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl b/nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl
index 322ff1980223..259eabea7291 100644
--- a/nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/server-ips/server-ips-resp.json.tpl
@@ -3,8 +3,6 @@
         "private": [
             {
                 "addr": "%(ip)s",
-                "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
-                "OS-EXT-IPS:type": "fixed",
                 "version": 4
             }
         ]
diff --git a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py
index a3e3d37383a7..5152c30554a0 100644
--- a/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py
+++ b/nova/tests/unit/api/openstack/compute/plugins/v3/test_servers.py
@@ -477,26 +477,14 @@ class ServersControllerTest(ControllerTest):
         expected = {
             'addresses': {
                 'private': [
-                    {'version': 4, 'addr': '192.168.0.3',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'bb:bb:bb:bb:bb:bb'},
-                    {'version': 4, 'addr': '192.168.0.4',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'bb:bb:bb:bb:bb:bb'},
+                    {'version': 4, 'addr': '192.168.0.3'},
+                    {'version': 4, 'addr': '192.168.0.4'},
                 ],
                 'public': [
-                    {'version': 4, 'addr': '172.19.0.1',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                    {'version': 4, 'addr': '172.19.0.2',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                    {'version': 4, 'addr': '1.2.3.4',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'},
-                    {'version': 6, 'addr': 'b33f::fdee:ddff:fecc:bbaa',
-                     'OS-EXT-IPS:type': 'fixed',
-                     'OS-EXT-IPS-MAC:mac_addr': 'aa:aa:aa:aa:aa:aa'},
+                    {'version': 4, 'addr': '172.19.0.1'},
+                    {'version': 4, 'addr': '172.19.0.2'},
+                    {'version': 4, 'addr': '1.2.3.4'},
+                    {'version': 6, 'addr': 'b33f::fdee:ddff:fecc:bbaa'},
                 ],
             },
         }