diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 7c03ab72d9..fc410702b2 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -62,9 +62,9 @@ api_opts = [
                help=_('Address to bind the server. Useful when '
                       'selecting a particular network interface.'),
                deprecated_group='DEFAULT'),
-    cfg.IntOpt('bind_port', default=8004, min=1, max=65535,
-               help=_('The port on which the server will listen.'),
-               deprecated_group='DEFAULT'),
+    cfg.PortOpt('bind_port', default=8004,
+                help=_('The port on which the server will listen.'),
+                deprecated_group='DEFAULT'),
     cfg.IntOpt('backlog', default=4096,
                help=_("Number of backlog requests "
                       "to configure the socket with."),
@@ -100,9 +100,9 @@ api_cfn_opts = [
                help=_('Address to bind the server. Useful when '
                       'selecting a particular network interface.'),
                deprecated_group='DEFAULT'),
-    cfg.IntOpt('bind_port', default=8000, min=1, max=65535,
-               help=_('The port on which the server will listen.'),
-               deprecated_group='DEFAULT'),
+    cfg.PortOpt('bind_port', default=8000,
+                help=_('The port on which the server will listen.'),
+                deprecated_group='DEFAULT'),
     cfg.IntOpt('backlog', default=4096,
                help=_("Number of backlog requests "
                       "to configure the socket with."),
@@ -138,9 +138,9 @@ api_cw_opts = [
                help=_('Address to bind the server. Useful when '
                       'selecting a particular network interface.'),
                deprecated_group='DEFAULT'),
-    cfg.IntOpt('bind_port', default=8003, min=1, max=65535,
-               help=_('The port on which the server will listen.'),
-               deprecated_group='DEFAULT'),
+    cfg.PortOpt('bind_port', default=8003,
+                help=_('The port on which the server will listen.'),
+                deprecated_group='DEFAULT'),
     cfg.IntOpt('backlog', default=4096,
                help=_("Number of backlog requests "
                       "to configure the socket with."),