diff --git a/nova/conf/api.py b/nova/conf/api.py
index a9b9535c209f..6c779e1a0059 100644
--- a/nova/conf/api.py
+++ b/nova/conf/api.py
@@ -283,6 +283,14 @@ osapi_hide_opts = [
         default=[BUILDING],
         deprecated_group="DEFAULT",
         deprecated_name="osapi_hide_server_address_states",
+        deprecated_for_removal=True,
+        deprecated_since="17.0.0",
+        deprecated_reason="This option hide the server address in server "
+                          "representation for configured server states. "
+                          "Which makes GET server API controlled by this "
+                          "config options. Due to this config options, user "
+                          "would not be able to discover the API behavior on "
+                          "different clouds which leads to the interop issue.",
         help="""
 This option is a list of all instance states for which network address
 information should not be returned from the API.
diff --git a/nova/policies/hide_server_addresses.py b/nova/policies/hide_server_addresses.py
index 47781a8aa2f9..c408d5ad0f39 100644
--- a/nova/policies/hide_server_addresses.py
+++ b/nova/policies/hide_server_addresses.py
@@ -38,7 +38,14 @@ By default 'addresses' is hidden only when the server is in
                 'method': 'GET',
                 'path': '/servers/detail'
             }
-        ]),
+        ],
+        deprecated_for_removal=True,
+        deprecated_reason=(
+            'Capability of configuring the server states to hide the '
+            'address has been deprecated for removal. Now this policy is '
+            'not needed to control the server address'
+        ),
+        deprecated_since='17.0.0'),
 ]
 
 
diff --git a/releasenotes/notes/deprecate-configurable-hide-server-address-feature-0ca03d8c8d11e991.yaml b/releasenotes/notes/deprecate-configurable-hide-server-address-feature-0ca03d8c8d11e991.yaml
new file mode 100644
index 000000000000..4e22fca527d9
--- /dev/null
+++ b/releasenotes/notes/deprecate-configurable-hide-server-address-feature-0ca03d8c8d11e991.yaml
@@ -0,0 +1,10 @@
+---
+deprecations:
+  - |
+    The ``hide_server_address_states`` configuration option is now
+    deprecated for removal. In future, there will be hard coded
+    server state ``building`` for which server address will be hidden.
+    The policy 'os_compute_api:os-hide-server-addresses' also is deprecated
+    for removal. More details `here`_
+
+    .. _here: https://specs.openstack.org/openstack/nova-specs/specs/queens/approved/remove-configurable-hide-server-address-feature.html