diff --git a/etcd.changes b/etcd.changes
index 1e8f380..3e21ae5 100644
--- a/etcd.changes
+++ b/etcd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 16 20:34:06 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- update etcd.service: avoid args from commandline and environment
+  as it leads to start failure (bsc#1183703) 
+
 -------------------------------------------------------------------
 Wed Mar 03 13:50:06 UTC 2021 - alexandre.vicenzi@suse.com
 
diff --git a/etcd.service b/etcd.service
index 4023af6..89e9866 100644
--- a/etcd.service
+++ b/etcd.service
@@ -10,7 +10,7 @@ WorkingDirectory=/var/lib/etcd/
 EnvironmentFile=-/etc/sysconfig/etcd
 User=etcd
 # set GOMAXPROCS to number of processors
-ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/sbin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\""
+ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/sbin/etcd"
 Restart=on-failure
 LimitNOFILE=65536
 Nice=-10