diff --git a/.env b/.env
index 05533ee..7e7b0b1 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,10 @@
+CVTT_DOCKER_REGISTRY=cloud16.cvtt.vpn:5543
+
 CVTT_USER=1001:1001
-MD_RECORDER_VERSION=0.1.3
+
+CB28_MD_RECORDER_VERSION=1.0.3
+BS28_MD_RECORDER_VERSION=1.0.3
+TSDB_RECORDER_VERSION=1.0.1
 
 CONFIG_FILE=/config/md_recorder.cfg
 CREDS_FILE=/config/.creds
diff --git a/config/md_recorder.cfg b/config/md_recorder.cfg
index d013989..b293a0b 100644
--- a/config/md_recorder.cfg
+++ b/config/md_recorder.cfg
@@ -11,7 +11,7 @@
                 , "type":               "SPOT"
 
                 , "mktdata" : {
-                    "class":  "cvttpy.exchanges.coinbase.spot.mkt_data.CoinbaseMdFeed"
+                    "class":  "cvttpy_trading.exchanges.coinbase.spot.mkt_data.CoinbaseSpotMdFeed"
 
                     , "reconnect_secs": 2
                     , "max_connections": 10
@@ -30,7 +30,7 @@
                 , "type":               "SPOT"
 
                 , "mktdata" : {
-                    "class": "cvttpy.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
+                    "class": "cvttpy_trading.exchanges.binance.spot.mkt_data.BnbSpotMktDataFeed"
                     , "max_connections": 10
                     , "reconnect_secs": 2.0
 
@@ -51,7 +51,7 @@
                 , "type":               "FUTURES"
 
                 , "mktdata" : {
-                    "class":           "cvttpy.exchanges.binance.futures.mkt_data.BnbFutMktDataFeed"
+                    "class":           "cvttpy_trading.exchanges.binance.futures.mkt_data.BnbFutMktDataFeed"
                     , "max_connections": 10
                     , "reconnect_secs": 2.0
 
@@ -100,7 +100,7 @@
             ]
         }
         , "db": {
-            "class": "cvttpy.tools.db.timescale.tsdb_client.TimescaleDbClient"
+            "class": "cvttpy_tools.db.timescale.tsdb_client.TimescaleDbClient"
         }
         , "flush_interval_sec": 0.5
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 684d5c3..b9bfed2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
 
     cbspot28_md_recorder:
-        image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION}
+        image: ${CVTT_DOCKER_REGISTRY}/md_recorder:${CB28_MD_RECORDER_VERSION}
         container_name: ${CB28_CONTAINER_NAME}
         user: ${CVTT_USER:-1001:1001}
         pull_policy: always
@@ -27,7 +27,7 @@ services:
             - timescaledb
 
     bnbspot28_md_recorder:
-        image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION}
+        image: ${CVTT_DOCKER_REGISTRY}/md_recorder:${BS28_MD_RECORDER_VERSION}
         container_name: ${BS28_CONTAINER_NAME}
         user: ${CVTT_USER:-1001:1001}
         pull_policy: always
@@ -52,34 +52,34 @@ services:
         depends_on:
             - timescaledb
 
-    bnbfut28_md_recorder:
-        image: cloud21.cvtt.vpn:5500/md_recorder:${MD_RECORDER_VERSION}
-        container_name: ${BF28_CONTAINER_NAME}
-        user: ${CVTT_USER:-1001:1001}
-        pull_policy: always
-        restart: unless-stopped
-        environment:
-            CONFIG_SERVICE:     ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
-            CONFIG_FILE:        ${CONFIG_FILE:-/config/md_recorder.cfg}
-            CREDS_FILE:         ${CREDS_FILE}
-            EXCHANGE_ACCT_NAME: ${BF28_EXCHANGE_ACCT_NAME}
-            INSTRUMENT_GROUP:   ${BF28_INSTRUMENT_GROUP}
-            DB_CRED_KEY:        ${BF28_DB_CRED_KEY}
-            LOG_FILE:           ${BF28_LOG_FILE}
-            ADD_ARGS:           ${BF28_ADD_ARGS:-}
-            MDREC_DEBUG:        ${BF28_DEBUG:-N}
-            MDREC_DEBUG_WAIT:   ${BF28_DEBUG_WAIT:-N}
-        volumes:
-            - ./config:/config
-            - ./logs:/logs
-        ports:
-            - ${BF28_ADMIN_PORT}:7200
-            - ${BF28_DEBUG_PORT}:5678
-        depends_on:
-            - timescaledb
-
+#    bnbfut28_md_recorder:
+#        image: ${CVTT_DOCKER_REGISTRY}/md_recorder:${MD_RECORDER_VERSION}
+#        container_name: ${BF28_CONTAINER_NAME}
+#        user: ${CVTT_USER:-1001:1001}
+#        pull_policy: always
+#        restart: unless-stopped
+#        environment:
+#            CONFIG_SERVICE:     ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+#            CONFIG_FILE:        ${CONFIG_FILE:-/config/md_recorder.cfg}
+#            CREDS_FILE:         ${CREDS_FILE}
+#            EXCHANGE_ACCT_NAME: ${BF28_EXCHANGE_ACCT_NAME}
+#            INSTRUMENT_GROUP:   ${BF28_INSTRUMENT_GROUP}
+#            DB_CRED_KEY:        ${BF28_DB_CRED_KEY}
+#            LOG_FILE:           ${BF28_LOG_FILE}
+#            ADD_ARGS:           ${BF28_ADD_ARGS:-}
+#            MDREC_DEBUG:        ${BF28_DEBUG:-N}
+#            MDREC_DEBUG_WAIT:   ${BF28_DEBUG_WAIT:-N}
+#        volumes:
+#            - ./config:/config
+#            - ./logs:/logs
+#        ports:
+#            - ${BF28_ADMIN_PORT}:7200
+#            - ${BF28_DEBUG_PORT}:5678
+#        depends_on:
+#            - timescaledb
+#
     timescaledb:
-        image: cloud21.cvtt.vpn:5500/md_recorder-tsdb:${MD_RECORDER_VERSION}
+        image: ${CVTT_DOCKER_REGISTRY}/md_recorder-tsdb:${TSDB_RECORDER_VERSION}
         container_name: md_recorder-tsdb
         pull_policy: always
         environment: