diff --git a/lib/tfw/networking/controller_connector.py b/lib/tfw/networking/controller_connector.py
index 4a9caca..64f83b2 100644
--- a/lib/tfw/networking/controller_connector.py
+++ b/lib/tfw/networking/controller_connector.py
@@ -2,7 +2,7 @@ import zmq
 from zmq.eventloop import ioloop
 from zmq.eventloop.zmqstream import ZMQStream
 
-from tfw.config import CONTROLLER_PORT
+from tfw.config import tfwenv
 from tfw.util import ZMQConnectorBase
 
 ioloop.install()
@@ -12,7 +12,7 @@ class ControllerConnector(ZMQConnectorBase):
     def __init__(self, zmq_context=None):
         super(ControllerConnector, self).__init__(zmq_context)
         self._zmq_rep_socket = self._zmq_context.socket(zmq.REP)
-        self._zmq_rep_socket.connect('tcp://localhost:{}'.format(CONTROLLER_PORT))
+        self._zmq_rep_socket.connect('tcp://localhost:{}'.format(tfwenv.CONTROLLER_PORT))
         self._zmq_rep_stream = ZMQStream(self._zmq_rep_socket)
 
         self.register_callback = self._zmq_rep_stream.on_recv_stream
diff --git a/lib/tfw/networking/solvable_connector.py b/lib/tfw/networking/solvable_connector.py
index d7f0425..7a77a57 100644
--- a/lib/tfw/networking/solvable_connector.py
+++ b/lib/tfw/networking/solvable_connector.py
@@ -1,7 +1,7 @@
 import zmq
 from zmq.eventloop import ioloop
 
-from tfw.config import CONTROLLER_PORT
+from tfw.config import tfwenv
 from tfw.util import ZMQConnectorBase
 from tfw.networking.serialization import serialize_all, deserialize_all
 
@@ -12,7 +12,7 @@ class SolvableConnector(ZMQConnectorBase):
     def __init__(self, zmq_context=None):
         super(SolvableConnector, self).__init__(zmq_context)
         self._zmq_req_socket = self._zmq_context.socket(zmq.REQ)
-        self._zmq_req_socket.bind('tcp://*:{}'.format(CONTROLLER_PORT))
+        self._zmq_req_socket.bind('tcp://*:{}'.format(tfwenv.CONTROLLER_PORT))
 
     def send(self, key, message):
         self._zmq_req_socket.send_multipart(serialize_all(key, message))
diff --git a/src/controller/app.py b/src/controller/app.py
index 02873a3..73b321c 100644
--- a/src/controller/app.py
+++ b/src/controller/app.py
@@ -1,7 +1,7 @@
 from tornado.ioloop import IOLoop
 from tornado.web import Application
 
-from tfw.config import CRP_LISTENER_PORT, AVATAO_SECRET
+from tfw.config import tfwenv, AVATAO_SECRET
 from handlers import SolutionCheckHandler, TestHandler
 from tfw.networking.solvable_connector import SolvableConnector
 
@@ -17,6 +17,6 @@ if __name__ == '__main__':
     app = Application(
         routes
     )
-    app.listen(CRP_LISTENER_PORT)
-    log.debug('Controller listening on {}'.format(CRP_LISTENER_PORT))
+    app.listen(tfwenv.CRP_LISTENER_PORT)
+    log.debug('Controller listening on {}'.format(tfwenv.CRP_LISTENER_PORT))
     IOLoop.instance().start()