diff --git a/cluster/prod/app/bagage/deploy/bagage.hcl b/cluster/prod/app/bagage/deploy/bagage.hcl
index fbb571d..76dff22 100644
--- a/cluster/prod/app/bagage/deploy/bagage.hcl
+++ b/cluster/prod/app/bagage/deploy/bagage.hcl
@@ -13,8 +13,8 @@ job "bagage" {
 
     network {
       port "web_port" { 
-        static = 8080
-        to = 8080 
+        static = 8015
+        to = 8015
       }
       port "ssh_port" { 
         static = 2222
diff --git a/cluster/prod/app/email/deploy/email-android7.hcl b/cluster/prod/app/email/deploy/email-android7.hcl
index f2f92c6..ad44f2c 100644
--- a/cluster/prod/app/email/deploy/email-android7.hcl
+++ b/cluster/prod/app/email/deploy/email-android7.hcl
@@ -1,5 +1,6 @@
 job "email-android7" {
-  datacenters = ["neptune", "bespin"]
+  # Should not run on the same site as email.hcl (port conflict in diplonat)
+  datacenters = ["scorpio", "bespin"]
   type = "service"
   priority = 100
 
diff --git a/cluster/prod/app/email/deploy/email.hcl b/cluster/prod/app/email/deploy/email.hcl
index 3c6d7b4..10e4d50 100644
--- a/cluster/prod/app/email/deploy/email.hcl
+++ b/cluster/prod/app/email/deploy/email.hcl
@@ -1,4 +1,5 @@
 job "email" {
+  # Should not run on the same site as email-android7.hcl (port conflict in diplonat)
   datacenters = ["neptune"]
   type = "service"
   priority = 65
diff --git a/doc/ports b/doc/ports
index 73fdb48..984ef2f 100644
--- a/doc/ports
+++ b/doc/ports
@@ -37,6 +37,7 @@ ports so that we can avoid conflicts when adding services.
 5432    psql_proxy
 5433    postgresql
 8008    synapse
+8015    bagage
 8080    jitsi video bridge (prod) / reserved (staging)
 8300    consul
 8301    consul