diff --git a/cmake/cmake.version b/cmake/cmake.version
index ad78dbbc1e..52730e84e5 100644
--- a/cmake/cmake.version
+++ b/cmake/cmake.version
@@ -15,6 +15,18 @@ IF (TD_PRODUCT_NAME)
   ADD_DEFINITIONS(-DTD_PRODUCT_NAME="${TD_PRODUCT_NAME}")
 ENDIF ()
 
+IF (CUS_NAME)
+  ADD_DEFINITIONS(-DCUS_NAME="${CUS_NAME}")
+ENDIF ()
+
+IF (CUS_PROMPT)
+  ADD_DEFINITIONS(-DCUS_PROMPT="${CUS_PROMPT}")
+ENDIF ()
+
+IF (CUS_EMAIL)
+  ADD_DEFINITIONS(-DCUS_EMAIL="${CUS_EMAIL}")
+ENDIF ()
+
 find_program(HAVE_GIT NAMES git)
 
 IF (DEFINED GITINFO)
diff --git a/include/os/osDir.h b/include/os/osDir.h
index c0d8530b4f..99d3ebccde 100644
--- a/include/os/osDir.h
+++ b/include/os/osDir.h
@@ -31,9 +31,7 @@
 extern "C" {
 #endif
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
-#endif
 
 #ifdef WINDOWS
 
diff --git a/include/util/cus_name.h b/include/util/cus_name.h
index 16f677f855..fe05491742 100644
--- a/include/util/cus_name.h
+++ b/include/util/cus_name.h
@@ -16,12 +16,23 @@
 #ifndef _CUS_NAME_H_
 #define _CUS_NAME_H_
 
+//
+// support OEM
+//
+#ifndef TD_PRODUCT_NAME
+#ifdef TD_ENTERPRISE
+#define TD_PRODUCT_NAME "TDengine Enterprise Edition"
+#else
+#define TD_PRODUCT_NAME "TDengine Community Edition"
+#endif
+#endif
+
 #ifndef CUS_NAME
 #define CUS_NAME    "TDengine"
 #endif
 
 #ifndef CUS_PROMPT
-#define CUS_PROMPT  "taos"
+#define CUS_PROMPT "taos"
 #endif
 
 #ifndef CUS_EMAIL
diff --git a/include/util/tdef.h b/include/util/tdef.h
index 0cfc7ab591..cd7a697e59 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -17,6 +17,7 @@
 #define _TD_UTIL_DEF_H_
 
 #include "os.h"
+#include "cus_name.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,14 +80,6 @@ extern const int32_t TYPE_BYTES[21];
 #define TSDB_DEFAULT_PASS "taosdata"
 #endif
 
-#ifndef TD_PRODUCT_NAME
-#ifdef TD_ENTERPRISE
-#define TD_PRODUCT_NAME "TDengine Enterprise Edition"
-#else
-#define TD_PRODUCT_NAME "TDengine Community Edition"
-#endif
-#endif
-
 #define TSDB_TRUE  1
 #define TSDB_FALSE 0
 #define TSDB_OK    0
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index b69585a356..11bdb16eca 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -38,13 +38,7 @@
 #include "tversion.h"
 #include "tconv.h"
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
-#endif
-
-#ifndef CUS_PROMPT
-#define CUS_PROMPT "taos"
-#endif
 
 #define TSC_VAR_NOT_RELEASE 1
 #define TSC_VAR_RELEASED    0
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 5b3a015553..ade301aab7 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -28,9 +28,6 @@
 
 #include "tutil.h"
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
-#include "cus_name.h"
-#endif
 
 #define CONFIG_PATH_LEN (TSDB_FILENAME_LEN + 12)
 #define CONFIG_FILE_LEN (CONFIG_PATH_LEN + 32)
diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
index ce1c409bfb..bd7da3f4d6 100644
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -30,21 +30,8 @@
 #include "jemalloc/jemalloc.h"
 #endif
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
-#else
-#ifndef CUS_NAME
-#define CUS_NAME "TDengine"
-#endif
 
-#ifndef CUS_PROMPT
-#define CUS_PROMPT "taos"
-#endif
-
-#ifndef CUS_EMAIL
-#define CUS_EMAIL "<support@taosdata.com>"
-#endif
-#endif
 // clang-format off
 #define DM_APOLLO_URL    "The apollo string to use when configuring the server, such as: -a 'jsonFile:./tests/cfg.json', cfg.json text can be '{\"fqdn\":\"td1\"}'."
 #define DM_CFG_DIR       "Configuration directory."
diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c
index 526f1a33e4..6cb0e00b82 100644
--- a/source/os/src/osSysinfo.c
+++ b/source/os/src/osSysinfo.c
@@ -16,14 +16,7 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taoserror.h"
-
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
 #include "cus_name.h"
-#else
-#ifndef CUS_PROMPT
-#define CUS_PROMPT "taos"
-#endif
-#endif
 
 #define PROCESS_ITEM 12
 #define UUIDLEN37 37
diff --git a/tests/army/tools/benchmark/basic/commandline.py b/tests/army/tools/benchmark/basic/commandline.py
index 0a60e1f876..94b812aed0 100644
--- a/tests/army/tools/benchmark/basic/commandline.py
+++ b/tests/army/tools/benchmark/basic/commandline.py
@@ -31,18 +31,16 @@ class TDTestCase(TBase):
         # run
         outputs = etool.runBinFile("taosBenchmark", "-V")
         print(outputs)
-        if len(outputs) != 3:
-            tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
+        if len(outputs) != 4:
+            tdLog.exit(f"checkVersion return lines count {len(outputs)} != 4")
         # version string len
-        assert len(outputs[0]) > 27
-        assert outputs[0][:22] == "taosBenchmark version:"
-
+        assert len(outputs[1]) > 24
         # commit id
-        assert len(outputs[1]) > 43
-        assert outputs[1][:4] == "git:"
+        assert len(outputs[2]) > 43
+        assert outputs[2][:4] == "git:"
         # build info
-        assert len(outputs[2]) > 36
-        assert outputs[2][:6] == "build:"
+        assert len(outputs[3]) > 36
+        assert outputs[3][:6] == "build:"
 
         tdLog.info("check taosBenchmark version successfully.")        
 
diff --git a/tests/army/tools/benchmark/basic/insertMix.py b/tests/army/tools/benchmark/basic/insertMix.py
index fc8b37f440..87af632373 100644
--- a/tests/army/tools/benchmark/basic/insertMix.py
+++ b/tests/army/tools/benchmark/basic/insertMix.py
@@ -34,7 +34,7 @@ class TDTestCase(TBase):
         sql = "select count(*) from meters"
         tdSql.query(sql)
         allCnt = tdSql.getData(0, 0)
-        if allCnt < 2000000:
+        if allCnt < 200000:
             tdLog.exit(f"taosbenchmark insert row small. row count={allCnt} sql={sql}")
             return 
         
diff --git a/tests/army/tools/benchmark/basic/json/insertMix.json b/tests/army/tools/benchmark/basic/json/insertMix.json
index b70a6f40ff..66ef7a970d 100644
--- a/tests/army/tools/benchmark/basic/json/insertMix.json
+++ b/tests/army/tools/benchmark/basic/json/insertMix.json
@@ -30,7 +30,7 @@
                     "name": "meters",
                     "child_table_exists": "no",
                     "childtable_count": 10,
-                    "insert_rows": 300000,
+                    "insert_rows": 30000,
                     "childtable_prefix": "d",
                     "insert_mode": "taosc",
                     "insert_interval": 0,
diff --git a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
index 6c535f794e..f1bee5bab4 100644
--- a/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
+++ b/tests/army/tools/taosdump/ws/taosdumpEscapedDb.py
@@ -31,17 +31,16 @@ class TDTestCase(TBase):
         # run
         outputs = etool.runBinFile("taosdump", "-V")
         print(outputs)
-        if len(outputs) != 3:
-            tdLog.exit(f"checkVersion return lines count {len(outputs) != 3}")
+        if len(outputs) != 4:
+            tdLog.exit(f"checkVersion return lines count {len(outputs)} != 4")
         # version string len
-        assert len(outputs[0]) > 22
-        assert outputs[0][:17] == "taosdump version:"
+        assert len(outputs[1]) > 19
         # commit id
-        assert len(outputs[1]) > 43
-        assert outputs[1][:4] == "git:"
+        assert len(outputs[2]) > 43
+        assert outputs[2][:4] == "git:"
         # build info
-        assert len(outputs[2]) > 36
-        assert outputs[2][:6] == "build:"
+        assert len(outputs[3]) > 36
+        assert outputs[3][:6] == "build:"
 
         tdLog.info("check taosdump version successfully.")
 
diff --git a/tools/shell/src/shellArguments.c b/tools/shell/src/shellArguments.c
index 88918a14ac..ba210850eb 100644
--- a/tools/shell/src/shellArguments.c
+++ b/tools/shell/src/shellArguments.c
@@ -17,16 +17,10 @@
 #include <pwd.h>
 #endif
 
+#include "cus_name.h"
 #include "shellInt.h"
 #include "version.h"
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
-#include "cus_name.h"
-#else
-#ifndef CUS_PROMPT
-#define CUS_PROMPT "taos"
-#endif
-#endif
 
 #define TAOS_CONSOLE_PROMPT_CONTINUE "   -> "
 
diff --git a/tools/taos-tools/inc/dump.h b/tools/taos-tools/inc/dump.h
index 1050676af3..b21dca4343 100644
--- a/tools/taos-tools/inc/dump.h
+++ b/tools/taos-tools/inc/dump.h
@@ -49,22 +49,6 @@
 // ---------------- define ----------------
 //
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
-#include <cus_name.h>
-#else
-#ifndef CUS_NAME
-    #define CUS_NAME      "TDengine"
-#endif
-
-#ifndef CUS_PROMPT
-    #define CUS_PROMPT    "taos"
-#endif
-
-#ifndef CUS_EMAIL
-    #define CUS_EMAIL     "<support@taosdata.com>"
-#endif
-#endif
-
 
 // use 256 as normal buffer length
 #define BUFFER_LEN              256
diff --git a/tools/taos-tools/src/benchCommandOpt.c b/tools/taos-tools/src/benchCommandOpt.c
index 1968a731f5..8c18b54eac 100644
--- a/tools/taos-tools/src/benchCommandOpt.c
+++ b/tools/taos-tools/src/benchCommandOpt.c
@@ -10,7 +10,8 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <bench.h>
+ #include "cus_name.h"  // include/util/
+ #include <bench.h>
 #include "benchLog.h"
 #include <toolsdef.h>
 
@@ -29,7 +30,7 @@ char *g_aggreFunc[] = {"*",       "count(*)", "avg(C0)",   "sum(C0)",
 
 void printVersion() {
     // version, macro define in src/CMakeLists.txt
-    printf("taosBenchmark version: %s\n", TD_VER_NUMBER);
+    printf("%s\n%sBenchmark version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER);
     printf("git: %s\n", TAOSBENCHMARK_COMMIT_ID);
     printf("build: %s\n", BUILD_INFO);
 }
diff --git a/tools/taos-tools/src/benchSys.c b/tools/taos-tools/src/benchSys.c
index 1a229f2cbd..9e29701515 100644
--- a/tools/taos-tools/src/benchSys.c
+++ b/tools/taos-tools/src/benchSys.c
@@ -12,6 +12,7 @@
 #include <stdlib.h>
 #include <bench.h>
 #include "benchLog.h"
+#include "cus_name.h"
 
 #ifdef LINUX
 #include <argp.h>
@@ -21,23 +22,7 @@
 #endif
 #endif
 
-extern char version[];
 
-#if defined(CUS_NAME) || defined(CUS_PROMPT) || defined(CUS_EMAIL)
-#include "cus_name.h"
-#else
-#ifndef CUS_NAME
-#define CUS_NAME        "TDengine"
-#endif
-
-#ifndef CUS_PROMPT
-#define CUS_PROMPT      "taos"
-#endif
-
-#ifndef CUS_EMAIL
-#define CUS_EMAIL       "<support@taosdata.com>"
-#endif
-#endif
 
 #ifdef WINDOWS
 char      g_configDir[MAX_PATH_LEN] = {0};  // "C:\\TDengine\\cfg"};
diff --git a/tools/taos-tools/src/taosdump.c b/tools/taos-tools/src/taosdump.c
index 8593752265..d27812b67a 100644
--- a/tools/taos-tools/src/taosdump.c
+++ b/tools/taos-tools/src/taosdump.c
@@ -11,6 +11,7 @@
 
 #define _GNU_SOURCE
 
+#include "cus_name.h"  // include/util/
 #include "dump.h"
 #include "dumpUtil.h"
 #ifdef WEBSOCKET
@@ -262,7 +263,7 @@ static void printVersion(FILE *file) {
     }
 
     // version, macro define in src/CMakeLists.txt
-    fprintf(file, "taosdump version: %s\n", TD_VER_NUMBER);
+    fprintf(file, "%s\n%sdump version: %s\n", TD_PRODUCT_NAME, CUS_PROMPT, TD_VER_NUMBER);
     fprintf(file, "git: %s\n", TAOSDUMP_COMMIT_ID);
     fprintf(file, "build: %s\n", BUILD_INFO);
 }