--- a/testing/docker/builder-autoland/config.json
+++ b/testing/docker/builder-autoland/config.json
@@ -24,12 +24,12 @@
   },
   "selfserve": {
     "user": "",
     "passwd": ""
   },
   "auth": {
     "autoland": "autoland"
   },
-  "database": "dbname=autoland user=postgres host=db",
+  "database": "dbname=autoland user=postgres host=autolanddb",
   "repos" : {
   }
 }

--- a/testing/docker/builder-autoland/start-autoland.sh
+++ b/testing/docker/builder-autoland/start-autoland.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 cd $AUTOLAND_HOME
 . venv/bin/activate
 
 cd autoland
-python autoland.py --log-path=/home/ubuntu/autoland.log --dsn="dbname=autoland user=postgres host=db" &
+python autoland.py --log-path=/home/ubuntu/autoland.log --dsn="dbname=autoland user=postgres host=autolanddb" &
 apache2ctl -D FOREGROUND

--- a/testing/vcttesting/docker.py
+++ b/testing/vcttesting/docker.py
@@ -1168,17 +1168,17 @@ class Docker(object):
                 treestatus_state = self.client.inspect_container(treestatus_id)
 
             if start_autoland:
                 assert start_hgrb
                 assert start_treestatus
                 f_start_autoland = e.submit(
                     self.client.start,
                     autoland_id,
-                    links=[(autolanddb_state['Name'], 'db'),
+                    links=[(autolanddb_state['Name'], 'autolanddb'),
                            (web_state['Name'], 'bmoweb'),
                            (hgrb_state['Name'], 'hgrb'),
                            (treestatus_state['Name'], 'treestatus')],
                     port_bindings={80: autoland_port})
                 f_start_autoland.result()
                 autoland_state = self.client.inspect_container(autoland_id)
 
             if start_rbweb: