diff --git a/README.rst b/README.rst
index 08ea130..5666ea7 100644
--- a/README.rst
+++ b/README.rst
@@ -114,6 +114,13 @@ Native packages for your operating system will be provided in the near future.
 .. _OpenSuSE 12/13: https://build.opensuse.org/package/show/systemsmanagement:puppet/python-puppetboard
 .. _SuSE LE 11 SP3: https://build.opensuse.org/package/show/systemsmanagement:puppet/python-puppetboard
 
+Docker Images
+^^^^^^^^^^^^^
+
+A `Dockerfile`_ was added to the source-code in the 0.2.0 release. An officially
+image is planned for the 0.2.x series.
+
+.. _Dockerfile: https://github.com/voxpupuli/puppetboard/blob/master/Dockerfile
 
 Development
 -----------
diff --git a/puppetboard/default_settings.py b/puppetboard/default_settings.py
index d5f3bc9..595e690 100644
--- a/puppetboard/default_settings.py
+++ b/puppetboard/default_settings.py
@@ -1,6 +1,6 @@
 import os
 
-PUPPETDB_HOST = 'puppetdb'
+PUPPETDB_HOST = 'localhost'
 PUPPETDB_PORT = 8080
 PUPPETDB_SSL_VERIFY = True
 PUPPETDB_KEY = None