diff --git a/source/dnode/CMakeLists.txt b/source/dnode/CMakeLists.txt
index 3670f259af9341d9061eb3b565e681dd9e184893..87e4c5fc4623365d5fbedd605ba485443c1fffbf 100644
--- a/source/dnode/CMakeLists.txt
+++ b/source/dnode/CMakeLists.txt
@@ -3,5 +3,4 @@ add_subdirectory(vnode)
 add_subdirectory(qnode)
 add_subdirectory(snode)
 add_subdirectory(bnode)
-add_subdirectory(mgmt)
-add_subdirectory(vnode2)
\ No newline at end of file
+add_subdirectory(mgmt)
\ No newline at end of file
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 6b21f935c4ef675e678428ba8948fa1dd030d5bf..152a9e29455dcfefc1737c91fc91171db47af915 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -1,54 +1,76 @@
-set(META_DB_IMPL_LIST "BDB" "TDB")
-set(META_DB_IMPL "TDB" CACHE STRING "Use BDB as the default META implementation")
-set_property(CACHE META_DB_IMPL PROPERTY STRINGS ${META_DB_IMPL_LIST})
-
-if(META_DB_IMPL IN_LIST META_DB_IMPL_LIST)
-    message(STATUS "META DB Impl: ${META_DB_IMPL}==============")
-else()
-    message(FATAL_ERROR "Invalid META DB IMPL: ${META_DB_IMPL}==============")
-endif()
+# vnode
+add_library(vnode STATIC "")
+target_sources(
+    vnode
+    PRIVATE
+    # vnode
+    "src/vnd/vnodeArenaMAImpl.c"
+    "src/vnd/vnodeBufferPool.c"
+    "src/vnd/vnodeCfg.c"
+    "src/vnd/vnodeCommit.c"
+    "src/vnd/vnodeInt.c"
+    "src/vnd/vnodeMain.c"
+    "src/vnd/vnodeMgr.c"
+    "src/vnd/vnodeQuery.c"
+    "src/vnd/vnodeStateMgr.c"
+    "src/vnd/vnodeWrite.c"
 
-aux_source_directory(src/meta META_SRC)
-if(${META_DB_IMPL} STREQUAL "BDB")
-    list(REMOVE_ITEM META_SRC "src/meta/metaTDBImpl.c")
-elseif(${META_DB_IMPL} STREQUAL "TDB")
-    list(REMOVE_ITEM META_SRC "src/meta/metaBDBImpl.c")
-endif()
+    # meta
+    # "src/meta/metaBDBImpl.c"
+    "src/meta/metaCache.c"
+    "src/meta/metaCfg.c"
+    "src/meta/metaIdx.c"
+    "src/meta/metaMain.c"
+    "src/meta/metaQuery.c"
+    "src/meta/metaTable.c"
+    "src/meta/metaTbCfg.c"
+    "src/meta/metaTbTag.c"
+    "src/meta/metaTbUid.c"
+    "src/meta/metaTDBImpl.c"
 
-aux_source_directory(src/tq TQ_SRC)
-aux_source_directory(src/tsdb TSDB_SRC)
-aux_source_directory(src/vnd VND_SRC)
+    # tsdb
+    "src/tsdb/tsdbBDBImpl.c"
+    "src/tsdb/tsdbCommit.c"
+    "src/tsdb/tsdbCompact.c"
+    "src/tsdb/tsdbFile.c"
+    "src/tsdb/tsdbFS.c"
+    "src/tsdb/tsdbMain.c"
+    "src/tsdb/tsdbMemTable.c"
+    "src/tsdb/tsdbOptions.c"
+    "src/tsdb/tsdbRead.c"
+    "src/tsdb/tsdbReadImpl.c"
+    "src/tsdb/tsdbScan.c"
+    "src/tsdb/tsdbSma.c"
+    "src/tsdb/tsdbWrite.c"
 
-list(APPEND
-    VNODE_SRC
-    ${META_SRC}
-    ${TQ_SRC}
-    ${TSDB_SRC}
-    ${VND_SRC}
+    # tq
+    "src/tq/tq.c"
+    "src/tq/tqCommit.c"
+    "src/tq/tqMetaStore.c"
+    "src/tq/tqOffset.c"
+    "src/tq/tqPush.c"
+    "src/tq/tqRead.c"
 )
-
-add_library(vnode STATIC ${VNODE_SRC})
 target_include_directories(
     vnode
-    PUBLIC inc
-    PRIVATE src/inc
+    PUBLIC "inc"
+    PRIVATE "src/inc"
 )
 target_link_libraries(
     vnode
     PUBLIC os
     PUBLIC util
     PUBLIC common
-    PUBLIC transport
     PUBLIC tfs
     PUBLIC wal
-    PUBLIC scheduler
-    PUBLIC executor
-    PUBLIC stream
     PUBLIC qworker
     PUBLIC sync
-    # TODO: get rid of BDB
-    PUBLIC bdb
+    PUBLIC executor
+    PUBLIC scheduler
     PUBLIC tdb
+    PUBLIC bdb
+    PUBLIC transport
+    PUBLIC stream
 )
 
 if(${BUILD_TEST})