diff --git a/README.md b/README.md
index 6360cf7970..2e84183db6 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,12 @@
 These are a set of puppet manifests and modules that are currently being
-used to manage some of the efforts of the OpenStack CI project. They are
-quite bare and crappy at the moment, but should grow soon.
+used to manage the OpenStack CI infrastructure.
 
-Additionally, there is a script, make_puppet_lp.py which is used to generate
-a few lists of users from launchpad teams, to make management and population
-of user accounts on different types of servers easier.
+The main entry point is in manifests/site.py.
 
-There are currently two different entry points, the slave.pp and the
-server.pp manifest.
+In general, most of the modules here are designed to be able to be run
+either in agent or apply mode.
 
-slave.pp is intended to be for jenkins slaves and adds all members of
-~openstack-ci-admins
-
-server.pp is intended as the base for other servers and adds members of
-~openstack-admins
-
-Puppet needs to be installed via gems, because we use the pip package
-provider for one of the packages and that is only in 2.7.
-
-For instance:
-
-/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/slave.pp
-
-or
-
-/var/lib/gems/1.8/bin/puppet apply --modulepath=`pwd`/modules manifests/server.pp
+These puppet modules require puppet 2.7 or greater. Additionally, the
+site.pp manifest assumes the existence of hiera.
 
+See http://ci.openstack.org for more information.