diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 20b8f7ceb..76e87e1fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -167,7 +167,6 @@ jobs:
           EXPOSE_MYSQL_PORT=$((5455 + RUNNER_NUM * 10))
           MINIO_PORT=$((9000 + RUNNER_NUM * 10))
           MINIO_CONSOLE_PORT=$((9001 + RUNNER_NUM * 10))
-          REDIS_PORT=$((6379 + RUNNER_NUM * 10))
           TEI_PORT=$((6380 + RUNNER_NUM * 10))
           KIBANA_PORT=$((6601 + RUNNER_NUM * 10))
           SVR_HTTP_PORT=$((9380 + RUNNER_NUM * 10))
@@ -187,7 +186,6 @@ jobs:
           echo -e "EXPOSE_MYSQL_PORT=${EXPOSE_MYSQL_PORT}" >> docker/.env
           echo -e "MINIO_PORT=${MINIO_PORT}" >> docker/.env
           echo -e "MINIO_CONSOLE_PORT=${MINIO_CONSOLE_PORT}" >> docker/.env
-          echo -e "REDIS_PORT=${REDIS_PORT}" >> docker/.env
           echo -e "TEI_PORT=${TEI_PORT}" >> docker/.env
           echo -e "KIBANA_PORT=${KIBANA_PORT}" >> docker/.env
           echo -e "SVR_HTTP_PORT=${SVR_HTTP_PORT}" >> docker/.env
diff --git a/conf/service_conf.yaml b/conf/service_conf.yaml
index b303d69ae..4b6777839 100644
--- a/conf/service_conf.yaml
+++ b/conf/service_conf.yaml
@@ -43,7 +43,8 @@ redis:
   db: 1
   username: ''
   password: 'infini_rag_flow'
-  host: 'localhost:6379'
+  host: 'localhost'
+  port: 6379
 task_executor:
   message_queue_type: 'redis'
 user_default_llm:
diff --git a/docker/service_conf.yaml.template b/docker/service_conf.yaml.template
index f283f0853..a34845b11 100644
--- a/docker/service_conf.yaml.template
+++ b/docker/service_conf.yaml.template
@@ -51,7 +51,8 @@ redis:
   db: 1
   username: '${REDIS_USERNAME:-}'
   password: '${REDIS_PASSWORD:-infini_rag_flow}'
-  host: '${REDIS_HOST:-redis}:6379'
+  host: '${REDIS_HOST:-redis}'
+  port: '${REDIS_PORT:-6379}'
 user_default_llm:
   default_models:
     embedding_model:
diff --git a/rag/utils/redis_conn.py b/rag/utils/redis_conn.py
index d134f0533..99ad47796 100644
--- a/rag/utils/redis_conn.py
+++ b/rag/utils/redis_conn.py
@@ -125,8 +125,8 @@ class RedisDB:
     def __open__(self):
         try:
             conn_params = {
-                "host": self.config["host"].split(":")[0],
-                "port": int(self.config.get("host", ":6379").split(":")[1]),
+                "host": self.config["host"],
+                "port": int(self.config.get("port", 6379)),
                 "db": int(self.config.get("db", 1)),
                 "decode_responses": True,
             }
diff --git a/test/testcases/test_http_api/test_chat_management/test_table_parser_dataset_chat.py b/test/testcases/test_http_api/test_chat_management/test_table_parser_dataset_chat.py
index cfe547cdb..2fefa50ba 100644
--- a/test/testcases/test_http_api/test_chat_management/test_table_parser_dataset_chat.py
+++ b/test/testcases/test_http_api/test_chat_management/test_table_parser_dataset_chat.py
@@ -162,7 +162,7 @@ class TestTableParserDatasetChat:
         [
             ("show me column of product", r"\|product\|Source"),
             ("which product has price 79", r"Keyboard"),
-            ("How many rows in the dataset?", r"count\(\*\)"),
+            ("How many rows in the dataset?", r"rows|count\(\*\)"),
             ("Show me all employees in Engineering department", r"(Alice|Carol|Frank)"),
         ],
     )