diff --git a/servers/puppet/modules/humbug/manifests/app_frontend.pp b/servers/puppet/modules/humbug/manifests/app_frontend.pp
index 71729d69d1..dfa5b731da 100644
--- a/servers/puppet/modules/humbug/manifests/app_frontend.pp
+++ b/servers/puppet/modules/humbug/manifests/app_frontend.pp
@@ -31,21 +31,6 @@ class humbug::app_frontend {
     mode => 644,
     source => "puppet:///modules/humbug/nginx/humbug-include/",
   }
-  file { "/etc/nginx/sites-available/humbug":
-    require => Package[nginx],
-    ensure => file,
-    owner  => "root",
-    group  => "root",
-    mode => 644,
-    source => "puppet:///modules/humbug/nginx/sites-available/humbug",
-  }
-
-
-  file { '/etc/nginx/sites-enabled/humbug':
-    ensure => 'link',
-    target => '/etc/nginx/sites-available/humbug',
-  }
-
   file { "/etc/memcached.conf":
     require => Package[memcached],
     ensure => file,
@@ -92,8 +77,6 @@ class humbug::app_frontend {
   # TODO: Add /usr/lib/nagios/plugins/check_send_receive_time ->
   # /home/humbug/humbug-deployments/current/api/humbug/bots/check_send_receive.py symlink
 
-  # TODO: Setup the API distribution directory at /srv/www/dist/api/.
-
   # TODO: Ensure Django 1.5 is installed; this should be possible via
   # the backports-sloppy mechanism or via backports once we upgrade to
   # wheezy.
diff --git a/servers/puppet/modules/humbug/manifests/prod_app_frontend.pp b/servers/puppet/modules/humbug/manifests/prod_app_frontend.pp
new file mode 100644
index 0000000000..9aa3874a44
--- /dev/null
+++ b/servers/puppet/modules/humbug/manifests/prod_app_frontend.pp
@@ -0,0 +1,20 @@
+class humbug::prod_app_frontend {
+  class { 'humbug::app_frontend': }
+
+  file { "/etc/nginx/sites-available/humbug":
+    require => Package[nginx],
+    ensure => file,
+    owner  => "root",
+    group  => "root",
+    mode => 644,
+    source => "puppet:///modules/humbug/nginx/sites-available/humbug",
+  }
+  file { '/etc/nginx/sites-enabled/humbug':
+    ensure => 'link',
+    target => '/etc/nginx/sites-available/humbug',
+  }
+
+
+  # TODO: Setup the API distribution directory at /srv/www/dist/api/.
+
+}
diff --git a/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp b/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp
new file mode 100644
index 0000000000..ffd3ddac9e
--- /dev/null
+++ b/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp
@@ -0,0 +1,17 @@
+class humbug::staging_app_frontend {
+  class { 'humbug::app_frontend': }
+
+  file { "/etc/nginx/sites-available/humbug-staging":
+    require => Package[nginx],
+    ensure => file,
+    owner  => "root",
+    group  => "root",
+    mode => 644,
+    source => "puppet:///modules/humbug/nginx/sites-available/humbug-staging",
+  }
+  file { '/etc/nginx/sites-enabled/humbug-staging':
+    ensure => 'link',
+    target => '/etc/nginx/sites-available/humbug-staging',
+  }
+
+}