diff --git a/launch/README b/launch/README
index 33786596e1..80189c825b 100644
--- a/launch/README
+++ b/launch/README
@@ -2,10 +2,11 @@ Create Server
 =============
 
 Note that these instructions assume you're working from this
-directory on an updated local clone of the repository on the puppetmaster, and
-that your account is a member of the puppet and salt groups for access
-to their respective keys::
+directory on an updated local clone of the repository on the
+puppetmaster, and that your account is a member of the admin, puppet
+and salt groups for access to their respective keys::
 
+  sudo adduser $(whoami) admin
   sudo adduser $(whoami) puppet
   sudo adduser $(whoami) salt
 
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 539f52f601..8203d9b7cf 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -46,7 +46,7 @@ class openstack_project::puppetmaster (
   file { '/root/ci-launch':
     ensure => directory,
     owner  => 'root',
-    group  => 'root',
+    group  => 'admin',
     mode   => '0750',
     }