diff --git a/glance/common/config.py b/glance/common/config.py
index 62b4157d5e..534ad57b90 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -584,9 +584,9 @@ Related options:
     * data_api
 
 """)),
-    cfg.StrOpt('pydev_worker_debug_host',
-               sample_default='localhost',
-               help=_("""
+    cfg.HostAddressOpt('pydev_worker_debug_host',
+                       sample_default='localhost',
+                       help=_("""
 Host address of the pydev server.
 
 Provide a string value representing the hostname or IP of the
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index f9faf56a29..afeed606ec 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -56,16 +56,9 @@ from glance.i18n import _, _LE, _LI, _LW
 
 
 bind_opts = [
-    # NOTE(dharinic): Since ``bind_host`` accepts symbolic names
-    # mapped to IP address apart from IP addresses, we use
-    # ``StrOpt`` as against ``IPOpt`` for backward compatibility
-    # reasons. We do not use ``HostnameOpt`` as it would prevent the
-    # opt from accepting IPv6 addresses.
-    # TODO(dharinic): Change the Opt type upon resolution of
-    # bug-1619044
-    cfg.StrOpt('bind_host',
-               default='0.0.0.0',
-               help=_("""
+    cfg.HostAddressOpt('bind_host',
+                       default='0.0.0.0',
+                       help=_("""
 IP address to bind the glance servers to.
 
 Provide an IP address to bind the glance server to. The default
diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py
index 50c168b5d6..06fbe00c42 100644
--- a/glance/registry/__init__.py
+++ b/glance/registry/__init__.py
@@ -23,8 +23,9 @@ from glance.i18n import _
 
 
 registry_addr_opts = [
-    cfg.StrOpt('registry_host', default='0.0.0.0',
-               help=_("""
+    cfg.HostAddressOpt('registry_host',
+                       default='0.0.0.0',
+                       help=_("""
 Address the registry server is hosted on.
 
 Possible values: