diff --git a/CHANGES.md b/CHANGES.md
index dc1d1013ae8262368d7b9928cf0ad77976a22736..e951e95249d5828ffa7eccf7e19498d39e52ef8e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Release Notes.
 
 * Fix potential NPE in OAL string match and a bug when right-hand-side variable includes double quotes.
 * Bump up Armeria version to fix CVE.
+* Polish ETCD cluster config environment variables.
 
 #### UI
 
diff --git a/docs/en/setup/backend/backend-cluster.md b/docs/en/setup/backend/backend-cluster.md
index 119a04d0efe967c8f3381198788571ab036ab636..bb829a9dd83e8ec4c4d525e5e43d607731610d7a 100644
--- a/docs/en/setup/backend/backend-cluster.md
+++ b/docs/en/setup/backend/backend-cluster.md
@@ -99,10 +99,10 @@ cluster:
     # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
     endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
     namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-    serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+    serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-    user: ${SW_SCLUSTER_ETCD_USER:}
-    password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+    user: ${SW_CLUSTER_ETCD_USER:}
+    password: ${SW_CLUSTER_ETCD_PASSWORD:}
 ```
 
 Same as the Zookeeper coordinator,
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 631be411d0af71f9dcd68ed37f30d054da028904..b9a99c08910f4064cc6a4bf9e8aae47c615eab78 100755
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -41,10 +41,10 @@ cluster:
     # etcd cluster nodes, example: 10.0.0.1:2379,10.0.0.2:2379,10.0.0.3:2379
     endpoints: ${SW_CLUSTER_ETCD_ENDPOINTS:localhost:2379}
     namespace: ${SW_CLUSTER_ETCD_NAMESPACE:/skywalking}
-    serviceName: ${SW_SCLUSTER_ETCD_ERVICE_NAME:"SkyWalking_OAP_Cluster"}
+    serviceName: ${SW_CLUSTER_ETCD_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     authentication: ${SW_CLUSTER_ETCD_AUTHENTICATION:false}
-    user: ${SW_SCLUSTER_ETCD_USER:}
-    password: ${SW_SCLUSTER_ETCD_PASSWORD:}
+    user: ${SW_CLUSTER_ETCD_USER:}
+    password: ${SW_CLUSTER_ETCD_PASSWORD:}
   nacos:
     serviceName: ${SW_SERVICE_NAME:"SkyWalking_OAP_Cluster"}
     hostPort: ${SW_CLUSTER_NACOS_HOST_PORT:localhost:8848}