diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index 5534aeb..9d7bcb5 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -213,7 +213,7 @@ class MalformedUploadError(Exception):
 def main():
     loadConfig()
     configure()
-    run(host='0.0.0.0', port=Settings.GATEWAY_HTTP_PORT, server='gevent')
+    run(host=Settings.GATEWAY_HTTP_BIND_ADDRESS, port=Settings.GATEWAY_HTTP_PORT, server='gevent')
 
 
 if __name__ == '__main__':
diff --git a/src/eddn/conf/Settings.py b/src/eddn/conf/Settings.py
index c4cafcf..f898ef5 100644
--- a/src/eddn/conf/Settings.py
+++ b/src/eddn/conf/Settings.py
@@ -31,7 +31,8 @@ class _Settings(object):
     #  Gateway settings
     ###############################################################################
 
-    GATEWAY_HTTP_PORT = 8080
+    GATEWAY_HTTP_BIND_ADDRESS = "127.0.0.1"
+    GATEWAY_HTTP_PORT = 8081
 
     GATEWAY_SENDER_BINDINGS = ["tcp://*:8500"]