diff --git a/launch/README b/launch/README
index 7be4e033bd..4759256779 100644
--- a/launch/README
+++ b/launch/README
@@ -23,21 +23,21 @@ To launch a node in the OpenStack Jenkins account (slave nodes)::
 
   . ~root/ci-launch/openstackjenkins-rs-nova.sh
   export FQDN=slavename.slave.openstack.org
-  export CERT=slavetype.slave.openstack.org
   nova image-list
   export IMAGE='Ubuntu 12.04 LTS (Precise Pangolin)'
   nova flavor-list
   export RAM=8192
-  sudo puppet cert generate $CERT
-  ./launch-node.py $FQDN --cert $CERT.pem --image "$IMAGE" --ram $RAM
+  sudo puppet cert generate $FQDN
+  ./launch-node.py $FQDN --image "$IMAGE" --ram $RAM
 
 If you are launching a replacement server, you may skip the generate
 step and specify the name of an existing puppet cert (as long as the
 private key is on this host).
 
-The server name and cert names may be different (as in the Jenkins
-slave example), but launch-node.py will assume they are the same
-unless specified.
+The server name and cert names may be different and the latter can be
+specified with --cert if needed (older Jenkins slave types still use
+shared certs), but launch-node.py will assume they are the same unless
+specified.
 
 Manually add the hostname to DNS (the launch script does not do so
 automatically). Note that this example assumes you've already
diff --git a/manifests/site.pp b/manifests/site.pp
index 5c29717f01..e7dd30faa6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -420,6 +420,26 @@ node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
   }
 }
 
+node /^precise3k-?\d+.*\.slave\.openstack\.org$/ {
+  include openstack_project
+  include openstack_project::puppet_cron
+  class { 'openstack_project::slave':
+    ssh_key   => $openstack_project::jenkins_ssh_key,
+    sysadmins => hiera('sysadmins'),
+    python3   => true,
+  }
+}
+
+node /^precise3k-dev\d+.*\.slave\.openstack\.org$/ {
+  include openstack_project
+  include openstack_project::puppet_cron
+  class { 'openstack_project::slave':
+    ssh_key   => $openstack_project::jenkins_dev_ssh_key,
+    sysadmins => hiera('sysadmins'),
+    python3   => true,
+  }
+}
+
 node /^centos6-?\d+\.slave\.openstack\.org$/ {
   include openstack_project
   include openstack_project::puppet_cron