diff --git a/v3/fleet-local/control/chronos@.service b/v3/fleet-local/control/chronos@.service
index 7e036ed..28b0131 100644
--- a/v3/fleet-local/control/chronos@.service
+++ b/v3/fleet-local/control/chronos@.service
@@ -10,7 +10,6 @@ Environment=ZOOKEEPER_HOST=localhost:2181
 Environment="IMAGE=etcdctl get /images/chronos"
 Environment="ZK_USERNAME=etcdctl get /zookeeper/config/username"
 Environment="ZK_PASSWORD=etcdctl get /zookeeper/config/password"
-Environment="ZK_ENDPOINT=etcdctl get /zookeeper/config/endpoint"
 Environment="MESOS_USERNAME=etcdctl get /mesos/config/username"
 
 User=core
@@ -41,7 +40,7 @@ ExecStart=/usr/bin/sh -c "docker run \
   --http_port 4400 \
   --mesos_authentication_principal $($MESOS_USERNAME) \
   --mesos_authentication_secret_file /opt/mesos/framework-secret \
-  --master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/mesos \
+  --master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/mesos \
   --mesos_framework_name chronos-$(hostname) \
   --zk_hosts ${ZOOKEEPER_HOST}"
 
diff --git a/v3/fleet-local/control/marathon@.service b/v3/fleet-local/control/marathon@.service
index 14221f7..ec261a1 100644
--- a/v3/fleet-local/control/marathon@.service
+++ b/v3/fleet-local/control/marathon@.service
@@ -4,14 +4,13 @@ Requires=docker.service
 After=docker.service bootstrap.service zk-health.service mesos-master@%i.service
 
 [Service]
-Environment=ZOOKEEPER=localhost:2181
+Environment=ZOOKEEPER_HOST=localhost:2181
 Environment="IMAGE=etcdctl get /images/marathon"
 Environment="USER=etcdctl get /marathon/config/username"
 Environment="PASSWORD=etcdctl get /marathon/config/password"
 Environment="MESOS_USERNAME=etcdctl get /mesos/config/username"
 Environment="ZK_USERNAME=etcdctl get /zookeeper/config/username"
 Environment="ZK_PASSWORD=etcdctl get /zookeeper/config/password"
-Environment="ZK_ENDPOINT=etcdctl get /zookeeper/config/endpoint"
 
 User=core
 Restart=always
@@ -36,8 +35,8 @@ ExecStart=/usr/bin/sh -c "/usr/bin/docker run \
   $($IMAGE) \
   --mesos_authentication_principal $($MESOS_USERNAME) \
   --mesos_authentication_secret_file /opt/mesos/framework-secret \
-  --master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/mesos \
-  --zk zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$($ZK_ENDPOINT)/marathon \
+  --master zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/mesos \
+  --zk zk://$($ZK_USERNAME):$($ZK_PASSWORD)@$ZOOKEEPER_HOST/marathon \
   --http_credentials $($USER):$($PASSWORD) \
   --checkpoint \
   --task_launch_timeout 300000"