diff --git a/config_service.code-workspace b/config_service.code-workspace
index 5c1198a..362d7c2 100644
--- a/config_service.code-workspace
+++ b/config_service.code-workspace
@@ -2,9 +2,6 @@
 	"folders": [
 		{
 			"path": "."
-		},
-		{
-			"path": ".."
 		}
 	]
 }
\ No newline at end of file
diff --git a/data/apps/common/__OLD__strategies .cfg b/data/apps/__DEPRECATED__/__OLD__strategies .cfg
similarity index 100%
rename from data/apps/common/__OLD__strategies .cfg
rename to data/apps/__DEPRECATED__/__OLD__strategies .cfg
diff --git a/data/apps/active_instruments.cfg b/data/apps/__DEPRECATED__/active_instruments.cfg
similarity index 100%
rename from data/apps/active_instruments.cfg
rename to data/apps/__DEPRECATED__/active_instruments.cfg
diff --git a/data/apps/cvtt.cfg b/data/apps/__DEPRECATED__/cvtt.cfg
similarity index 100%
rename from data/apps/cvtt.cfg
rename to data/apps/__DEPRECATED__/cvtt.cfg
diff --git a/data/apps/cvtt_crypto_coinbs.cfg b/data/apps/__DEPRECATED__/cvtt_crypto_coinbs.cfg
similarity index 100%
rename from data/apps/cvtt_crypto_coinbs.cfg
rename to data/apps/__DEPRECATED__/cvtt_crypto_coinbs.cfg
diff --git a/data/apps/md_portal.cfg b/data/apps/__DEPRECATED__/md_portal.cfg
similarity index 100%
rename from data/apps/md_portal.cfg
rename to data/apps/__DEPRECATED__/md_portal.cfg
diff --git a/data/apps/cvtt_eqt_alpaca.cfg b/data/apps/cvtt_eqt_alpaca.cfg
index 35e5d36..ce93945 100644
--- a/data/apps/cvtt_eqt_alpaca.cfg
+++ b/data/apps/cvtt_eqt_alpaca.cfg
@@ -3,7 +3,17 @@
 {   "___dummy___": null
     , "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata
     , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm
-    , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments
+    , "active_instruments": {
+        "ALPACA_SNDBX": {
+            "dynamic_stock_list": {
+                "exchange_id": "ALPACA"
+                , "list_source": "redis"
+                , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
+                , "redis_key": "DAY_STOCK_LIST"
+            }
+        }
+    }
+
     , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
     , "session_type": "CALENDAR"
     , "calendar_session": {
diff --git a/data/apps/md_recorder.cfg b/data/apps/md_recorder.cfg
index fdb48b3..fe590ca 100644
--- a/data/apps/md_recorder.cfg
+++ b/data/apps/md_recorder.cfg
@@ -2,16 +2,6 @@
     "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata
     , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm
 
-    // -------------------------------------------------------------------------
-    // This is used only for dynamically loaded instrument lists (as for Alpaca)
-    , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments
-    , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
-    # , "cvttcomm": {
-    #     "type": "redis"
-    #     , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
-    # }
-    //------------------------------------------------------------------------------
-
     , "md_recorder": {
         "instrument_groups": {
             "BNBFUT_CLD21": [
diff --git a/data/apps/tests/listen_market_data.cfg b/data/apps/tests/listen_market_data.cfg
index e9bed5e..ef8a33d 100644
--- a/data/apps/tests/listen_market_data.cfg
+++ b/data/apps/tests/listen_market_data.cfg
@@ -1,7 +1,16 @@
 {
     "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata
     , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm
-    , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments
+    , "active_instruments": {
+        "ALPACA_SNDBX": {
+            "dynamic_stock_list": {
+                "exchange_id": "ALPACA"
+                , "list_source": "redis"
+                , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
+                , "redis_key": "DAY_STOCK_LIST"
+            }
+        }
+    }
     "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 7a993c1..a9ae64a 100644
--- a/data/apps/tests/listen_market_data_prod.cfg
+++ b/data/apps/tests/listen_market_data_prod.cfg
@@ -1,7 +1,16 @@
 {
     "refdata": @inc=http://@env{CONFIG_SERVICE}/refdata/refdata
     , "comm": @inc=http://@env{CONFIG_SERVICE}/apps/common/comm
-    , "active_instruments": @inc=http://@env{CONFIG_SERVICE}/apps/active_instruments
+    , "active_instruments": {
+        "ALPACA_SNDBX": {
+            "dynamic_stock_list": {
+                "exchange_id": "ALPACA"
+                , "list_source": "redis"
+                , "comm_settings": "/comm/pubsub/redis/cvtt-prod-eqty-01"
+                , "redis_key": "DAY_STOCK_LIST"
+            }
+        }
+    }
     , "exchanges_settings": {
         "*": {
             "mkt_data": {