diff --git a/puppet/zulip/files/nginx/zulip-include-frontend/upstreams b/puppet/zulip/files/nginx/zulip-include-frontend/upstreams
new file mode 100644
index 0000000000..1275cb6988
--- /dev/null
+++ b/puppet/zulip/files/nginx/zulip-include-frontend/upstreams
@@ -0,0 +1,17 @@
+include /etc/nginx/zulip-include/tornado-upstreams;
+
+upstream django {
+    server unix:/home/zulip/deployments/uwsgi-socket;
+}
+
+upstream localhost_sso {
+    server 127.0.0.1:8888;
+}
+
+upstream camo {
+    server 127.0.0.1:9292;
+}
+
+upstream thumbor {
+    server localhost:9995;
+}
diff --git a/puppet/zulip/manifests/app_frontend_base.pp b/puppet/zulip/manifests/app_frontend_base.pp
index 54a01c8434..1f771ee33d 100644
--- a/puppet/zulip/manifests/app_frontend_base.pp
+++ b/puppet/zulip/manifests/app_frontend_base.pp
@@ -53,23 +53,12 @@ class zulip::app_frontend_base {
     }
   }
 
-  # The number of Tornado processes to run on the server; this
-  # defaults to 1, since Tornado sharding is currently only at the
-  # Realm level.
-  $tornado_processes = Integer(zulipconf('application_server', 'tornado_processes', 1))
-  if $tornado_processes > 1 {
-    $tornado_ports = range(9800, 9800 + $tornado_processes - 1)
-    $tornado_multiprocess = true
-  } else {
-    $tornado_multiprocess = false
-  }
-
   file { '/etc/nginx/zulip-include/upstreams':
     require => Package[$zulip::common::nginx],
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
-    content => template('zulip/nginx/upstreams.conf.template.erb'),
+    source  => 'puppet:///modules/zulip/nginx/zulip-include-frontend/upstreams',
     notify  => Service['nginx'],
   }
 
diff --git a/puppet/zulip/manifests/tornado_sharding.pp b/puppet/zulip/manifests/tornado_sharding.pp
index 7c48526a66..c6373410ee 100644
--- a/puppet/zulip/manifests/tornado_sharding.pp
+++ b/puppet/zulip/manifests/tornado_sharding.pp
@@ -25,4 +25,24 @@ class zulip::tornado_sharding {
     content => "{}\n",
     replace => false,
   }
+
+  # The number of Tornado processes to run on the server; this
+  # defaults to 1, since Tornado sharding is currently only at the
+  # Realm level.
+  $tornado_processes = Integer(zulipconf('application_server', 'tornado_processes', 1))
+  if $tornado_processes > 1 {
+    $tornado_ports = range(9800, 9800 + $tornado_processes - 1)
+    $tornado_multiprocess = true
+  } else {
+    $tornado_multiprocess = false
+  }
+
+  file { '/etc/nginx/zulip-include/tornado-upstreams':
+    require => Package[$zulip::common::nginx],
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => template('zulip/nginx/tornado-upstreams.conf.template.erb'),
+    notify  => Service['nginx'],
+  }
 }
diff --git a/puppet/zulip/templates/nginx/upstreams.conf.template.erb b/puppet/zulip/templates/nginx/tornado-upstreams.conf.template.erb
similarity index 53%
rename from puppet/zulip/templates/nginx/upstreams.conf.template.erb
rename to puppet/zulip/templates/nginx/tornado-upstreams.conf.template.erb
index 1da1abed51..7c72a8bef8 100644
--- a/puppet/zulip/templates/nginx/upstreams.conf.template.erb
+++ b/puppet/zulip/templates/nginx/tornado-upstreams.conf.template.erb
@@ -1,7 +1,3 @@
-upstream django {
-    server unix:/home/zulip/deployments/uwsgi-socket;
-}
-
 <% if @tornado_multiprocess -%>
 <% @tornado_ports.each do |port| -%>
 upstream tornado<%= port %> {
@@ -15,15 +11,3 @@ upstream tornado {
     keepalive 10000;
 }
 <% end -%>
-
-upstream localhost_sso {
-    server 127.0.0.1:8888;
-}
-
-upstream camo {
-    server 127.0.0.1:9292;
-}
-
-upstream thumbor {
-    server localhost:9995;
-}