diff --git a/watcher/conf/api.py b/watcher/conf/api.py
index ad8fa38c6..4531eca8e 100644
--- a/watcher/conf/api.py
+++ b/watcher/conf/api.py
@@ -32,9 +32,10 @@ API_SERVICE_OPTS = [
     cfg.PortOpt('port',
                 default=9322,
                 help='The port for the watcher API server'),
-    cfg.StrOpt('host',
-               default='127.0.0.1',
-               help='The listen IP address for the watcher API server'),
+    cfg.HostAddressOpt('host',
+                       default='127.0.0.1',
+                       help='The listen IP address for the watcher API server'
+                       ),
     cfg.IntOpt('max_limit',
                default=1000,
                help='The maximum number of items returned in a single '
diff --git a/watcher/conf/service.py b/watcher/conf/service.py
index 56ff8d408..0f18d3a60 100644
--- a/watcher/conf/service.py
+++ b/watcher/conf/service.py
@@ -26,13 +26,14 @@ SERVICE_OPTS = [
     cfg.IntOpt('periodic_interval',
                default=60,
                help=_('Seconds between running periodic tasks.')),
-    cfg.StrOpt('host',
-               default=socket.gethostname(),
-               help=_('Name of this node. This can be an opaque identifier. '
-                      'It is not necessarily a hostname, FQDN, or IP address. '
-                      'However, the node name must be valid within '
-                      'an AMQP key, and if using ZeroMQ, a valid '
-                      'hostname, FQDN, or IP address.')),
+    cfg.HostAddressOpt('host',
+                       default=socket.gethostname(),
+                       help=_('Name of this node. This can be an opaque '
+                              'identifier. It is not necessarily a hostname, '
+                              'FQDN, or IP address. However, the node name '
+                              'must be valid within an AMQP key, and if using '
+                              'ZeroMQ, a valid hostname, FQDN, or IP address.')
+                       ),
     cfg.IntOpt('service_down_time',
                default=90,
                help=_('Maximum time since last check-in for up service.'))