diff --git a/ziti-tunnel/deployment/linux/sysvinit/etc/init.d/ziti-tunnel b/ziti-tunnel/deployment/linux/sysvinit/etc/init.d/ziti-tunnel
index 40cfd06d5..147bf0c14 100644
--- a/ziti-tunnel/deployment/linux/sysvinit/etc/init.d/ziti-tunnel
+++ b/ziti-tunnel/deployment/linux/sysvinit/etc/init.d/ziti-tunnel
@@ -34,7 +34,7 @@ do_enroll()
     if [ ! -f "${cfgfile}" ]; then
         echo -n $"Enrolling ${service}: "
         if [ -f "${jwtfile}" ]; then
-            "${ziti_dir}/bin/ziti-enroller" --jwt "${jwtfile}" --out "${cfgfile}" >> "${logfile}" 2>&1
+            "${ziti_dir}/bin/ziti-tunnel" enroll --jwt "${jwtfile}" --out "${cfgfile}" >> "${logfile}" 2>&1
             if [ ${?} -ne 0 -o ! -f "${cfgfile}" ]; then
                 failure $"Enrolling ${service}"
                 echo ""
diff --git a/ziti-tunnel/docker/Dockerfile b/ziti-tunnel/docker/Dockerfile
index 16a7ec772..5d39e91aa 100644
--- a/ziti-tunnel/docker/Dockerfile
+++ b/ziti-tunnel/docker/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get -q update && apt-get -q install -y --no-install-recommends curl ca-c
 RUN /bin/bash -c "if ! compgen -G '/etc/ssl/certs/*.[0-9]' > /dev/null; then c_rehash /etc/ssl/certs; fi"
 
 COPY fetch-ziti-bins.sh .
-RUN bash ./fetch-ziti-bins.sh ziti-tunnel ziti-enroller
+RUN bash ./fetch-ziti-bins.sh ziti-tunnel
 
 ################
 #
diff --git a/ziti-tunnel/docker/docker-entrypoint.sh b/ziti-tunnel/docker/docker-entrypoint.sh
index 64a4fb80e..a4ad0656f 100755
--- a/ziti-tunnel/docker/docker-entrypoint.sh
+++ b/ziti-tunnel/docker/docker-entrypoint.sh
@@ -46,7 +46,7 @@ if [ ! -f "${json}" ]; then
         exit 1
     fi
     echo "enrolling ${jwt}"
-    ziti-enroller --jwt "${jwt}" --out "${json}"
+    ziti-tunnel enroll --jwt "${jwt}" --out "${json}"
 fi
 
 echo "running ziti-tunnel"