diff --git a/dist/common/sysconfig/scylla-jmx b/dist/common/sysconfig/scylla-jmx
index e15829a..2a634ab 100644
--- a/dist/common/sysconfig/scylla-jmx
+++ b/dist/common/sysconfig/scylla-jmx
@@ -4,28 +4,26 @@ SCYLLA_HOME=/var/lib/scylla
 # scylla config dir
 SCYLLA_CONF=/etc/scylla
 
-SCYLLA_PARAMS=""
-
 # The jmx port to open
-# SCYLLA_PARAMS="${SCYLLA_PARAMS } -jp 7199"
+# SCYLLA_JMX_PORT="-jp 7199"
 
 # The API port to connect to
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -p 12345"
+#SCYLLA_API_PORT="-p 10000"
 
 # API address to connect to
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -a `hostname`"
+#SCYLLA_API_ADDR="-a localhost"
 
 # use alternate jmx address
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -ja `hostname`"
+#SCYLLA_JMX_ADDR="-ja localhost"
 
 # A configuration file to use
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -cf /etc/scylla.d/scylla-user.cfg"
+#SCYLLA_JMX_FILE="-cf /etc/scylla.d/scylla-user.cfg"
 
 # The location of the jmx proxy jar file
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} target /some/scripts"
+SCYLLA_JMX_LOCAL="-l /usr/lib/scylla/jmx"
 
 # allow to run remotely
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -r"
+#SCYLLA_JMX_REMOTE="-r"
 
 # allow debug
-# SCYLLA_PARAMS="${SCYLLA_PARAMS} -d"
+#SCYLLA_JMX_DEBUG="-d"
diff --git a/dist/common/systemd/scylla-jmx.service.in b/dist/common/systemd/scylla-jmx.service.in
index 758dc66..df76cfc 100644
--- a/dist/common/systemd/scylla-jmx.service.in
+++ b/dist/common/systemd/scylla-jmx.service.in
@@ -8,7 +8,7 @@ Type=simple
 EnvironmentFile=@@SYSCONFDIR@@/scylla-jmx
 User=scylla
 Group=scylla
-ExecStart=/usr/lib/scylla/jmx/scylla-jmx -l /usr/lib/scylla/jmx ${SCYLLA_PARAMS}
+ExecStart=/usr/lib/scylla/jmx/scylla-jmx $SCYLLA_JMX_PORT $SCYLLA_API_PORT $SCYLLA_API_ADDR $SCYLLA_JMX_ADDR $SCYLLA_JMX_FILE $SCYLLA_JMX_LOCAL $SCYLLA_JMX_REMOTE $SCYLLA_JMX_DEBUG
 KillMode=process
 Restart=on-abnormal