diff --git a/data/apps/algo_trade.cfg b/data/apps/algo_trade.cfg
index a21514c..6695a01 100644
--- a/data/apps/algo_trade.cfg
+++ b/data/apps/algo_trade.cfg
@@ -1,10 +1,10 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 @var ResultPath=/tmp
 @var SourcePath=/home/oleg/develop/cvtt2/tmp
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "algos": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/algos
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos
 
     , "session_type": "CALENDAR"
     , "calendar_session": {
diff --git a/data/apps/cvtt.cfg b/data/apps/cvtt.cfg
index 38b5940..63e4f0b 100644
--- a/data/apps/cvtt.cfg
+++ b/data/apps/cvtt.cfg
@@ -1,9 +1,9 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 @var ResultPath=/tmp
 
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
     , "cvttcomm": {
         "type": "redis"
         # , "redis_settings": "localhost"
@@ -140,7 +140,7 @@
     # --------------------------------------------------------------------
     , "quant": {
         "app_channel": "QUANT"
-        , "strategies": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/strategies
+        , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies
         , "exchanges_settings": {
             "COINBASE_AT": {
                 "mkt_data": {
diff --git a/data/apps/cvtt_crypto_coinbs.cfg b/data/apps/cvtt_crypto_coinbs.cfg
index 590a72d..74d03af 100644
--- a/data/apps/cvtt_crypto_coinbs.cfg
+++ b/data/apps/cvtt_crypto_coinbs.cfg
@@ -1,9 +1,9 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 @var ResultPath=/tmp
 
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
     , "cvttcomm": {
         "type": "redis"
         # , "redis_settings": "localhost"
@@ -70,7 +70,7 @@
                 },
             }
         }
-        , "algos": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/algos
+        , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos
         , "trading_pos_diff_pct_trigger": 10.0
         , "trading_depth": {
             "BTC": 0.001
@@ -105,7 +105,7 @@
     , "quant": {
         "app_channel": "QUANT"
 
-        , "strategies": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/strategies
+        , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies
         , "exchanges_settings": {
             "COINBASE_AT": {
                 "mkt_data": {
diff --git a/data/apps/cvtt_eqt_alpaca.cfg b/data/apps/cvtt_eqt_alpaca.cfg
index c16f830..276c169 100644
--- a/data/apps/cvtt_eqt_alpaca.cfg
+++ b/data/apps/cvtt_eqt_alpaca.cfg
@@ -1,10 +1,10 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 @var ResultPath=/tmp
 
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "active_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/apps/active_instruments
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments
     , "cvttcomm": {
         "type": "redis"
         , "redis_settings": "cvtt-prod-02"
@@ -33,7 +33,7 @@
                 },
             }
         }
-        , "algos": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/algos
+        , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos
         , "trading_pos_diff_pct_trigger": 10.0
         , "trading_depth": {
             "USD": 1000.0,
@@ -102,7 +102,7 @@
     # --------------------------------------------------------------------
     , "quant": {
         "app_channel": "QUANT"
-        , "strategies": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/strategies
+        , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies
         , "exchanges_settings": {
             "*": {
                 "mkt_data": {
diff --git a/data/apps/cvtt_eqt_alpaca_ilya.cfg b/data/apps/cvtt_eqt_alpaca_ilya.cfg
index 3129fbc..f707a3e 100644
--- a/data/apps/cvtt_eqt_alpaca_ilya.cfg
+++ b/data/apps/cvtt_eqt_alpaca_ilya.cfg
@@ -1,10 +1,10 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 @var ResultPath=/tmp
 
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "active_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/apps/active_instruments
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments
     , "cvttcomm": {
         "type": "redis"
         , "redis_settings": "cvtt-prod-02"
@@ -33,7 +33,7 @@
                 },
             }
         }
-        , "algos": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/algos
+        , "algos": @inc=http://${CONFIG_SERVICE}/apps/common/algos
         , "trading_pos_diff_pct_trigger": 10.0
         , "trading_depth": {
             "USD": 1000.0,
@@ -102,7 +102,7 @@
     # --------------------------------------------------------------------
     , "quant": {
         "app_channel": "QUANT_03"
-        , "strategies": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/strategies
+        , "strategies": @inc=http://${CONFIG_SERVICE}/apps/common/strategies
         , "exchanges_settings": {
             "*": {
                 "mkt_data": {
diff --git a/data/apps/deprecated/md_recorder_old.cfg b/data/apps/deprecated/md_recorder_old.cfg
index 7882a52..a2836f9 100644
--- a/data/apps/deprecated/md_recorder_old.cfg
+++ b/data/apps/deprecated/md_recorder_old.cfg
@@ -1,5 +1,5 @@
 @var WINDOW_SIZE_SEC=2592000 # 30 days
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
     "md_recorder": {
         "db": {
@@ -68,7 +68,7 @@
     }
 
     # ----------------------------------
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
     , "exchanges_settings": {
         "COINBASE_AT": {
             "order_entry": {
diff --git a/data/apps/deprecated/quant_app.cfg b/data/apps/deprecated/quant_app.cfg
index b69e01a..7bb62b2 100644
--- a/data/apps/deprecated/quant_app.cfg
+++ b/data/apps/deprecated/quant_app.cfg
@@ -1,9 +1,9 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
 
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "cvttcomm": @inc=http://${CONFIG_SVC_HOST}:6789/apps/cvttcomm
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "cvttcomm": @inc=http://${CONFIG_SERVICE}/apps/cvttcomm
     , "quant": {
         "books": {
             "CVTT_BK01": {}
diff --git a/data/apps/md_portal.cfg b/data/apps/md_portal.cfg
index 48c0137..e3953c8 100644
--- a/data/apps/md_portal.cfg
+++ b/data/apps/md_portal.cfg
@@ -1,7 +1,7 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
     # ----------------------------------
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
 }
diff --git a/data/apps/md_recorder.cfg b/data/apps/md_recorder.cfg
index ab1ff20..811cbc4 100644
--- a/data/apps/md_recorder.cfg
+++ b/data/apps/md_recorder.cfg
@@ -1,9 +1,9 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "active_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/apps/active_instruments
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments
     , "cvttcomm": {
         "type": "redis"
         , "redis_settings": "cvtt-prod-02"
diff --git a/data/apps/minimal_md.cfg b/data/apps/minimal_md.cfg
index a7bcac3..a4e36ea 100644
--- a/data/apps/minimal_md.cfg
+++ b/data/apps/minimal_md.cfg
@@ -1,6 +1,6 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
     "exchanges_settings": {
         "*": {
             "mkt_data": {
diff --git a/data/apps/minimal_md_eqt.cfg b/data/apps/minimal_md_eqt.cfg
index 19ad7b5..8bdc6e7 100644
--- a/data/apps/minimal_md_eqt.cfg
+++ b/data/apps/minimal_md_eqt.cfg
@@ -1,6 +1,6 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
     , "calendar_session": {
         "trading_hours_url": [
             "GET"
diff --git a/data/apps/tests/cancel_all_orders.cfg b/data/apps/tests/cancel_all_orders.cfg
index be396c9..2af1b00 100644
--- a/data/apps/tests/cancel_all_orders.cfg
+++ b/data/apps/tests/cancel_all_orders.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
     "__DUMMY__": null
@@ -24,6 +24,6 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
 }
 
diff --git a/data/apps/tests/cancel_order.cfg b/data/apps/tests/cancel_order.cfg
index be396c9..2af1b00 100644
--- a/data/apps/tests/cancel_order.cfg
+++ b/data/apps/tests/cancel_order.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
     "__DUMMY__": null
@@ -24,6 +24,6 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
 }
 
diff --git a/data/apps/tests/get_open_orders.cfg b/data/apps/tests/get_open_orders.cfg
index 0b329cc..59ded74 100644
--- a/data/apps/tests/get_open_orders.cfg
+++ b/data/apps/tests/get_open_orders.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
     "__DUMMY__": null
@@ -29,6 +29,6 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
 }
 
diff --git a/data/apps/tests/get_positions.cfg b/data/apps/tests/get_positions.cfg
index 9996c9b..a2f3830 100644
--- a/data/apps/tests/get_positions.cfg
+++ b/data/apps/tests/get_positions.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
     "__DUMMY__": null
 
@@ -31,7 +31,7 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
 }
 
diff --git a/data/apps/tests/get_trades.cfg b/data/apps/tests/get_trades.cfg
index 83fceb9..cc0d3e1 100644
--- a/data/apps/tests/get_trades.cfg
+++ b/data/apps/tests/get_trades.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
     "__DUMMY__": null
 
@@ -22,7 +22,7 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
 }
 
diff --git a/data/apps/tests/listen_market_data.cfg b/data/apps/tests/listen_market_data.cfg
index 54eaf57..1e760f2 100644
--- a/data/apps/tests/listen_market_data.cfg
+++ b/data/apps/tests/listen_market_data.cfg
@@ -1,8 +1,8 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "active_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/apps/active_instruments
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments
     "exchanges_settings": {
         "*": {
             "mkt_data": {
diff --git a/data/apps/tests/listen_market_data_prod.cfg b/data/apps/tests/listen_market_data_prod.cfg
index e25cc36..c63e0ea 100644
--- a/data/apps/tests/listen_market_data_prod.cfg
+++ b/data/apps/tests/listen_market_data_prod.cfg
@@ -1,8 +1,8 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CONFIG_SVC_HOST}:6789/apps/common/redis
-    , "active_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/apps/active_instruments
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
+    , "active_instruments": @inc=http://${CONFIG_SERVICE}/apps/active_instruments
     , "exchanges_settings": {
         "*": {
             "mkt_data": {
diff --git a/data/apps/tests/send_order.cfg b/data/apps/tests/send_order.cfg
index 87923f3..a917d98 100644
--- a/data/apps/tests/send_order.cfg
+++ b/data/apps/tests/send_order.cfg
@@ -1,4 +1,4 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 
 {
     "__DUMMY__": null
@@ -23,6 +23,6 @@
             }
         }
     }
-    , "refdata": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/refdata
+    , "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
 }
 
diff --git a/data/apps/tests/send_order_cvtt.cfg b/data/apps/tests/send_order_cvtt.cfg
index 648d424..de8ad8c 100644
--- a/data/apps/tests/send_order_cvtt.cfg
+++ b/data/apps/tests/send_order_cvtt.cfg
@@ -1,7 +1,7 @@
-@var CVTT_CONFIG_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "refdata": @inc=http://${CVTT_CONFIG_HOST}:6789/refdata/refdata
-    , "redis": @inc=http://${CVTT_CONFIG_HOST}:6789/apps/common/redis
+    "refdata": @inc=http://${CONFIG_SERVICE}/refdata/refdata
+    , "redis": @inc=http://${CONFIG_SERVICE}/apps/common/redis
 
     , "cvttcomm": {
         "type": "redis"
diff --git a/data/refdata/refdata.cfg b/data/refdata/refdata.cfg
index afe178f..89f5633 100644
--- a/data/refdata/refdata.cfg
+++ b/data/refdata/refdata.cfg
@@ -1,8 +1,8 @@
-@var CONFIG_SVC_HOST=cloud23.cvtt.vpn
+@var CONFIG_SERVICE=cloud23.cvtt.vpn:6789
 {
-    "assets": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/assets
-    , "instruments": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/instruments
-    , "exchanges": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/exchanges
-    , "exchange_instruments": @inc=http://${CONFIG_SVC_HOST}:6789/refdata/exchange_instruments
+    "assets": @inc=http://${CONFIG_SERVICE}/refdata/assets
+    , "instruments": @inc=http://${CONFIG_SERVICE}/refdata/instruments
+    , "exchanges": @inc=http://${CONFIG_SERVICE}/refdata/exchanges
+    , "exchange_instruments": @inc=http://${CONFIG_SERVICE}/refdata/exchange_instruments
     , "dynamic_instrument_exchanges": ["ALPACA"]
 }