diff --git a/jobs/auctioneer/spec b/jobs/auctioneer/spec
index 174e2f13e5..f0e39862b4 100644
--- a/jobs/auctioneer/spec
+++ b/jobs/auctioneer/spec
@@ -48,6 +48,9 @@ properties:
   diego.auctioneer.cell_state_timeout:
     description: "Timeout applied to HTTP requests to the Cell State endpoint."
     default: "10s"
+  diego.auctioneer.bin_pack_first_fit_weight:
+    description: "Factor to bias against BOSH instance index number of a cell. Instead of spreading containers equally accross all cells, cells with a lower index number will be deployed to first when this setting is > 0. (0.0 - 1.0)"
+    default: 0.0
   diego.auctioneer.starting_container_weight:
     description: "Factor to bias against cells with starting containers (0.0 - 1.0)"
     default: 0.25
diff --git a/jobs/auctioneer/templates/auctioneer.json.erb b/jobs/auctioneer/templates/auctioneer.json.erb
index 6386c67da8..fc5919764b 100644
--- a/jobs/auctioneer/templates/auctioneer.json.erb
+++ b/jobs/auctioneer/templates/auctioneer.json.erb
@@ -16,6 +16,7 @@
     rep_client_session_cache_size: p("diego.auctioneer.rep.client_session_cache_size"),
     rep_require_tls: p("diego.auctioneer.rep.require_tls"),
     cell_state_timeout: p("diego.auctioneer.cell_state_timeout"),
+    bin_pack_first_fit_weight: p("diego.auctioneer.bin_pack_first_fit_weight"),
     starting_container_weight: p("diego.auctioneer.starting_container_weight"),
     starting_container_count_maximum: p("diego.auctioneer.starting_container_count_maximum"),
   }
diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb
index d2029fbc82..e7a0059733 100644
--- a/jobs/rep/templates/rep.json.erb
+++ b/jobs/rep/templates/rep.json.erb
@@ -29,6 +29,7 @@
     auto_disk_capacity_overhead_mb: p("diego.executor.auto_disk_capacity_overhead_mb"),
     cache_path: "#{download_cache_dir}",
     cell_id: spec.id,
+    cell_index: spec.index,
     cell_registrations_locket_enabled: p("cell_registrations.locket.enabled"),
     container_inode_limit: p("diego.executor.container_inode_limit"),
     container_max_cpu_shares: p("diego.executor.container_max_cpu_shares"),