diff --git a/puppet/zulip/manifests/profile/smokescreen.pp b/puppet/zulip/manifests/profile/smokescreen.pp
index cc9c1508ba..3cbfb6a8f6 100644
--- a/puppet/zulip/manifests/profile/smokescreen.pp
+++ b/puppet/zulip/manifests/profile/smokescreen.pp
@@ -7,6 +7,7 @@ class zulip::profile::smokescreen {
 
   $version = 'dc403015f563eadc556a61870c6ad327688abe88'
   $dir = "/srv/zulip-smokescreen-src-${version}/"
+  $bin = "/usr/local/bin/smokescreen-${version}"
 
   zulip::external_dep { 'smokescreen-src':
     version        => $version,
@@ -16,17 +17,17 @@ class zulip::profile::smokescreen {
   }
 
   exec { 'compile smokescreen':
-    command     => "${zulip::golang::bin} build -o /usr/local/bin/smokescreen-${version}",
+    command     => "${zulip::golang::bin} build -o ${bin}",
     cwd         => $dir,
     # GOCACHE is required; nothing is written to GOPATH, but it is required to be set
     environment => ['GOCACHE=/tmp/gocache', 'GOPATH=/root/go'],
-    creates     => "/usr/local/bin/smokescreen-${version}",
+    creates     => $bin,
     require     => [File[$zulip::golang::bin], File[$dir]],
   }
 
   file { '/usr/local/bin/smokescreen':
     ensure  => 'link',
-    target  => "/usr/local/bin/smokescreen-${version}",
+    target  => $bin,
     require => Exec['compile smokescreen'],
     notify  => Service[supervisor],
   }
@@ -36,7 +37,7 @@ class zulip::profile::smokescreen {
     ensure  => file,
     require => [
       Package[supervisor],
-      File['/usr/local/bin/smokescreen'],
+      File[$bin],
     ],
     owner   => 'root',
     group   => 'root',
diff --git a/puppet/zulip/templates/supervisor/smokescreen.conf.erb b/puppet/zulip/templates/supervisor/smokescreen.conf.erb
index a1cffe7164..16bcb1efd8 100644
--- a/puppet/zulip/templates/supervisor/smokescreen.conf.erb
+++ b/puppet/zulip/templates/supervisor/smokescreen.conf.erb
@@ -1,5 +1,5 @@
 [program:smokescreen]
-command=/usr/local/bin/smokescreen-<%= @version %> --listen-ip <%= @listen_address %>
+command=<%= @bin %> --listen-ip <%= @listen_address %>
 priority=15
 autostart=true
 autorestart=true