diff --git a/VERSION b/VERSION
index 2d4de50..cff5618 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.7,fix relative liquidity server
\ No newline at end of file
+0.1.8,using HA trading-calendar
\ No newline at end of file
diff --git a/market_data/alpaca_hbar/alpaca_hbar.sh b/market_data/alpaca_hbar/alpaca_hbar.sh
index c52daa0..70168ca 100755
--- a/market_data/alpaca_hbar/alpaca_hbar.sh
+++ b/market_data/alpaca_hbar/alpaca_hbar.sh
@@ -50,7 +50,7 @@ mkdir -p ${LogDir}
 
 echo "CommandLine: ${*}"
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calencar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 
 if [ -z ${Start}  ] ; then
diff --git a/market_data/alpaca_qat/alpaca_qat.sh b/market_data/alpaca_qat/alpaca_qat.sh
index 5fa213e..31d5a83 100755
--- a/market_data/alpaca_qat/alpaca_qat.sh
+++ b/market_data/alpaca_qat/alpaca_qat.sh
@@ -54,7 +54,7 @@ mkdir -p ${LogDir}
 
 echo "CommandLine: ${*}"
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calencar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 
 if [ -z ${Start}  ] ; then
diff --git a/market_data/crypto_md_day/crypto_md_day.sh b/market_data/crypto_md_day/crypto_md_day.sh
index f8f0764..d397f5b 100755
--- a/market_data/crypto_md_day/crypto_md_day.sh
+++ b/market_data/crypto_md_day/crypto_md_day.sh
@@ -52,7 +52,7 @@ export PYTHONPATH=/
 
 Cmd="python3.12"
 Cmd="${Cmd} cvttpy/research/utils/archive_ts_md.py"
-Cmd="${Cmd} --config=http://cloud23.cvtt.vpn:6789/apps/md_recorder"
+Cmd="${Cmd} --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder"
 Cmd="${Cmd} --db_credentials_key=${CredKey}"
 Cmd="${Cmd} --credentials_file=/.creds"
 Cmd="${Cmd} --date=${Date}"
diff --git a/market_data/md_recorder/run_md_recorder.sh b/market_data/md_recorder/run_md_recorder.sh
index 5dfc77b..cae4d73 100755
--- a/market_data/md_recorder/run_md_recorder.sh
+++ b/market_data/md_recorder/run_md_recorder.sh
@@ -26,7 +26,7 @@ if  ! is_valid "${job}"; then
     usage
 fi
 
-ConfigServer=cloud23.cvtt.vpn:6789
+ConfigServer=cloud16.cvtt.vpn:6789
 
 Cmd="python3.12"
 Cmd="${Cmd} cvttpy/apps/md/md_recorder.py"
diff --git a/market_data/md_recorder_monitor/run_mdr_monitor.sh b/market_data/md_recorder_monitor/run_mdr_monitor.sh
index 6bd2e2c..2920cc6 100755
--- a/market_data/md_recorder_monitor/run_mdr_monitor.sh
+++ b/market_data/md_recorder_monitor/run_mdr_monitor.sh
@@ -32,7 +32,7 @@ if [ "${2}" != "" ]; then
 fi
 
 
-ConfigServer=cloud23.cvtt.vpn:6789
+ConfigServer=cloud16.cvtt.vpn:6789
 
 Cmd="python3.12"
 Cmd="${Cmd} cvttpy/apps/md/md_rec_monitor.py"
diff --git a/research/crypto_exch_stats/Dockerfile b/research/crypto_exch_stats/Dockerfile
index 3cf9892..cd046b3 100644
--- a/research/crypto_exch_stats/Dockerfile
+++ b/research/crypto_exch_stats/Dockerfile
@@ -18,7 +18,7 @@ ENV PYTHONPATH=/
 CMD [                                                                      \
     "python3.12",                                                          \
     "cvttpy/apps//research/exchange_trading_stats.py",                     \
-    "--config=http://cloud23.cvtt.vpn:6789/apps/tests/listen_market_data", \
+    "--config=http://cloud16.cvtt.vpn:6789/apps/tests/listen_market_data", \
     "--active_exchanges=OKX,GEMINI,BITSTAMP,COINBASE_AT,BNBSPOT,KRAKEN",   \
     "--instruments=OKX:PAIR-BTC-USDT,GEMINI:PAIR-BTC-USD,BITSTAMP:PAIR-BTC-USD,COINBASE:PAIR-BTC-USD,BNBSPOT:PAIR-BTC-USDT,KRAKEN:PAIR-BTC-USD", \
     "--db_file=/app/data/exchange_trading_stats.db",                       \
diff --git a/trading.__DEPRECATED__/executor/run_executor.sh b/trading.__DEPRECATED__/executor/run_executor.sh
index 1054f57..ec3f20b 100755
--- a/trading.__DEPRECATED__/executor/run_executor.sh
+++ b/trading.__DEPRECATED__/executor/run_executor.sh
@@ -6,7 +6,7 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: $0"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7222)>"]
     echo -n " [-z (compress log)"]
@@ -14,7 +14,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX
 AdminPort=7222
 COMPRESS_LOG=false
diff --git a/trading.__DEPRECATED__/md_portal/run_md_portal.sh b/trading.__DEPRECATED__/md_portal/run_md_portal.sh
index 68c8b62..e886adc 100755
--- a/trading.__DEPRECATED__/md_portal/run_md_portal.sh
+++ b/trading.__DEPRECATED__/md_portal/run_md_portal.sh
@@ -5,7 +5,7 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: ${0}"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNBOX)>]"
     echo -n " [-a <admin_port (7220)>]"
     echo -n " [-n <portal_name (MD_PORTAL_ALPACA)>]"
@@ -14,7 +14,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX
 PortalName=MD_PORTAL_ALPACA_SNDBX
 AdminPort=7220
diff --git a/trading.__DEPRECATED__/quant/run_quant.sh b/trading.__DEPRECATED__/quant/run_quant.sh
index d9dfc6b..4f0fabe 100755
--- a/trading.__DEPRECATED__/quant/run_quant.sh
+++ b/trading.__DEPRECATED__/quant/run_quant.sh
@@ -7,7 +7,7 @@ usage() {
 
     echo -n " -S <strategy> (dflt: TRDALGO_001)"
 
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7224)>"]
     echo -n " [-z (compress log)"]
@@ -15,7 +15,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7224
 Strategy=DAILY_STOCK_001
diff --git a/trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh b/trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh
index 564c107..5f33b13 100755
--- a/trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh
+++ b/trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh
@@ -6,7 +6,7 @@
 usage() {
     echo -n "Usage: $0"
     echo -n " -b <book>"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -16,7 +16,7 @@ usage() {
 
 
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7223
 Book=""
diff --git a/trading.__DEPRECATED__/service_checker/run_svc_checker.sh b/trading.__DEPRECATED__/service_checker/run_svc_checker.sh
index 4f5baf5..7729490 100755
--- a/trading.__DEPRECATED__/service_checker/run_svc_checker.sh
+++ b/trading.__DEPRECATED__/service_checker/run_svc_checker.sh
@@ -5,12 +5,12 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: ${0}"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 
 
 while getopts ":c:" opt; do
diff --git a/trading.__DEPRECATED__/trader/run_trader.sh b/trading.__DEPRECATED__/trader/run_trader.sh
index b962ca8..4827ae8 100755
--- a/trading.__DEPRECATED__/trader/run_trader.sh
+++ b/trading.__DEPRECATED__/trader/run_trader.sh
@@ -10,7 +10,7 @@ usage() {
 
     echo -n " -A <algo> (dflt: TRDALGO_001)"
 
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -20,7 +20,7 @@ usage() {
 
 
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7226
 Algo=TRDALGO_001
diff --git a/trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh b/trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh
index 6aceab0..ca70b60 100755
--- a/trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh
+++ b/trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh
@@ -6,7 +6,7 @@
 usage() {
     echo -n "Usage: $0"
     echo -n " -b <book>"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -17,7 +17,7 @@ usage() {
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7225
 Book=""
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 COMPRESS_LOG=false