diff --git a/puppetboard/docker_settings.py b/puppetboard/docker_settings.py
index f022206..9ea14c3 100644
--- a/puppetboard/docker_settings.py
+++ b/puppetboard/docker_settings.py
@@ -1,6 +1,6 @@
 import os
 
-PUPPETDB_HOST = os.getenv('PUPPETDB_HOST', 'localhost')
+PUPPETDB_HOST = os.getenv('PUPPETDB_HOST', 'puppetdb')
 PUPPETDB_PORT = int(os.getenv('PUPPETDB_PORT', '8080'))
 # Since this is an env it will alwas be a string, we need
 # to conver that string to a bool
diff --git a/test/test_docker_settings.py b/test/test_docker_settings.py
index 33b1432..b9dbb61 100644
--- a/test/test_docker_settings.py
+++ b/test/test_docker_settings.py
@@ -25,7 +25,7 @@ class DockerTestCase(unittest.TestCase):
         reload(docker_settings)
 
     def test_default_host_port(self):
-        self.assertEqual(docker_settings.PUPPETDB_HOST, 'localhost')
+        self.assertEqual(docker_settings.PUPPETDB_HOST, 'puppetdb')
         self.assertEqual(docker_settings.PUPPETDB_PORT, 8080)
 
     def test_set_host_port(self):