diff --git a/AUTHORS b/AUTHORS
index 8dc0735a39..a3a2628211 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,5 +9,6 @@ Nikita Konovalov <nkonovalov@mirantis.com>
 Ruslan Kamaldinov <rkamaldinov@mirantis.com>
 Sergey Lukjanov <slukjanov@mirantis.com>
 Sergey Reshetnyak <sreshetniak@mirantis.com>
+Trevor McKay <tmckay@redhat.com>
 Vadim Rovachev <vrovachev@mirantis.com>
 Yaroslav Lobankov <ylobankov@mirantis.com>
\ No newline at end of file
diff --git a/etc/savanna/savanna.conf.sample b/etc/savanna/savanna.conf.sample
index 311198e6f9..bbd062addb 100644
--- a/etc/savanna/savanna.conf.sample
+++ b/etc/savanna/savanna.conf.sample
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # REST API config
-#port=8080
+#port=8386
 
 # Address and credentials that will be used to check auth tokens
 #os_auth_host=openstack
diff --git a/etc/savanna/savanna.conf.sample-full b/etc/savanna/savanna.conf.sample-full
index 3d10c39064..2a53b5beb4 100644
--- a/etc/savanna/savanna.conf.sample-full
+++ b/etc/savanna/savanna.conf.sample-full
@@ -8,7 +8,7 @@
 #host=
 
 # set port (integer value)
-#port=8080
+#port=8386
 
 
 #
diff --git a/savanna/config.py b/savanna/config.py
index 3b677fc022..9457c98059 100644
--- a/savanna/config.py
+++ b/savanna/config.py
@@ -18,7 +18,7 @@ from oslo.config import cfg
 cli_opts = [
     cfg.StrOpt('host', default='',
                help='Hostname of IP address that will be used to listen on'),
-    cfg.IntOpt('port', default=8080,
+    cfg.IntOpt('port', default=8386,
                help='Port that will be used to listen on'),
     cfg.BoolOpt('log-exchange', default=False,
                 help='Log request/response exchange details: environ, '
diff --git a/savanna/tests/integration/configs/config.py.sample b/savanna/tests/integration/configs/config.py.sample
index a898c5c5af..ae5f06933a 100644
--- a/savanna/tests/integration/configs/config.py.sample
+++ b/savanna/tests/integration/configs/config.py.sample
@@ -4,7 +4,7 @@ OS_TENANT_NAME = 'admin'
 OS_AUTH_URL = 'http://192.168.1.1:35357/v2.0/' # URL for keystone
 
 SAVANNA_HOST = '192.168.1.1' # IP for Savanna API
-SAVANNA_PORT = '8080' # port for Savanna API
+SAVANNA_PORT = '8386' # port for Savanna API
 
 IMAGE_ID = '42' # ID for instance image
 FLAVOR_ID = '42'
diff --git a/savanna/tests/integration/configs/parameters.py b/savanna/tests/integration/configs/parameters.py
index fbd03635b0..c9efde657c 100644
--- a/savanna/tests/integration/configs/parameters.py
+++ b/savanna/tests/integration/configs/parameters.py
@@ -27,7 +27,7 @@ OS_TENANT_NAME = _get_conf('OS_TENANT_NAME', 'admin')
 OS_AUTH_URL = _get_conf('OS_AUTH_URL', 'http://192.168.1.1:35357/v2.0/')
 
 SAVANNA_HOST = _get_conf('SAVANNA_HOST', '192.168.1.1')
-SAVANNA_PORT = _get_conf('SAVANNA_PORT', '8080')
+SAVANNA_PORT = _get_conf('SAVANNA_PORT', '8386')
 
 IMAGE_ID = _get_conf('IMAGE_ID', '42abc')
 FLAVOR_ID = _get_conf('FLAVOR_ID', '42')