diff --git a/README.md b/README.md
index b8cd85d..0b174ad 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@ request, you are agreeing to comply with this waiver of copyright interest.
 
 ## Getting Started
 Puppet Tests is developed using the following technologies:
-* Vagrant 2.2.2 + vagrant-libvirt 0.0.45
-* Ansible 2.7.5
+* Vagrant 2.2.3
+* Ansible 2.7.6
 * Puppet 4.8.2
 
 After installing the above, simply navigate to the root directory and deploy
@@ -23,11 +23,18 @@ the virtual machines:
 
 Vagrant will create at least two virtual machines and provision a puppet
 client-server architecture using Ansible code from the /setup/ folder. You will
-want to login to client:
+want to login to the puppet master:
+
+`vagrant ssh master`
+
+Sign the client's certificate and logout:
+
+`sudo puppet cert sign webserver`
+
+`exit`
+
+Now login to the webserver and provision the machine:
 
 `vagrant ssh webserv`
 
-After logging into the puppet client, provision the machine:
-
 `sudo puppet agent -t`
-
diff --git a/setup/roles/client/tasks/main.yml b/setup/roles/client/tasks/main.yml
index ea21efe..222d0ac 100644
--- a/setup/roles/client/tasks/main.yml
+++ b/setup/roles/client/tasks/main.yml
@@ -10,13 +10,6 @@
 - name: Start Puppet
   service: name=puppet state=started
 
-- name: Wait for Puppet Master
-  wait_for:
-    host: puppet
-    port: 8140
-    delay: 10
-  when: agent_install.changed
- 
 - name: Request Puppet Master
   command: puppet agent -t
   register: send_csr
diff --git a/setup/roles/server/tasks/main.yml b/setup/roles/server/tasks/main.yml
index 04ccc66..048f637 100644
--- a/setup/roles/server/tasks/main.yml
+++ b/setup/roles/server/tasks/main.yml
@@ -20,13 +20,3 @@
     chdir: /etc/puppet/code/environments/production
   when: r10k_install.changed
 
-- name: Wait for Webserver Key
-  wait_for:
-    path: /var/lib/puppet/ssl/ca/requests/webserver.pem
-  when: pup_install.changed
-
-- name: Sign Webserver Key
-  command: puppet cert sign webserver
-  args:
-    removes: /var/lib/puppet/ssl/ca/requests/webserver.pem
-