diff --git a/cloudformation/cfncluster.cfn.json b/cloudformation/cfncluster.cfn.json
index 4dac9b5808..7d3e4bf737 100644
--- a/cloudformation/cfncluster.cfn.json
+++ b/cloudformation/cfncluster.cfn.json
@@ -1865,12 +1865,12 @@
     },
     "CfnClusterVersions" : {
       "default" : {
-        "cfncluster" : "cfncluster-1.3.1",
-        "cookbook" : "cfncluster-cookbook-1.3.0",
-        "chef" : "12.13.30",
-        "ridley" : "4.5.1",
-        "berkshelf" : "4.6.1",
-        "ami" : "201609030709"
+        "cfncluster" : "cfncluster-1.3.2",
+        "cookbook" : "cfncluster-cookbook-1.3.2",
+        "chef" : "12.19.36",
+        "ridley" : "5.1.0",
+        "berkshelf" : "5.6.4",
+        "ami" : "dev"
       }
     },
     "AWSRegion2Capabilites" : {
diff --git a/cloudformation/cfncluster.cfn.yaml b/cloudformation/cfncluster.cfn.yaml
index 31b8a99229..18070dd679 100644
--- a/cloudformation/cfncluster.cfn.yaml
+++ b/cloudformation/cfncluster.cfn.yaml
@@ -4,7 +4,7 @@ AWSTemplateFormatVersion: '2010-09-09'
 Description: 'AWS CloudFormation Sample Template cfncluster.cfn.yaml: Sample template
   showing an framework for deploying master + compute type clusters on AWS.  **WARNING**
   This template creates AWS resources. You will be billed for the AWS resources used
-  if you create a stack from this template. Version: ami-201609030709 cfncluster-1.3.1'
+  if you create a stack from this template. Version: ami-dev cfncluster-1.3.2'
 
 Metadata:
   AWS::CloudFormation::Designer:
@@ -1173,12 +1173,12 @@ Mappings:
       ubuntu1604: ami-870edfe7
   CfnClusterVersions:
     default:
-      ami: '201609030709'
-      berkshelf: 4.6.1
-      cfncluster: cfncluster-1.3.1
-      chef: 12.13.30
-      cookbook: cfncluster-cookbook-1.3.0
-      ridley: 4.5.1
+      ami: 'dev'
+      berkshelf: 5.6.4
+      cfncluster: cfncluster-1.3.2
+      chef: 12.19.36
+      cookbook: cfncluster-cookbook-1.3.2
+      ridley: 5.1.0
   OSFeatures:
     alinux:
       RootDevice: /dev/xvda
@@ -3090,4 +3090,4 @@ Outputs:
     Value:
       Fn::GetAtt:
       - MasterServer
-      - PublicIp
\ No newline at end of file
+      - PublicIp
diff --git a/docs/source/ami_development.rst b/docs/source/ami_development.rst
index 19e291156b..aebbbb5a80 100644
--- a/docs/source/ami_development.rst
+++ b/docs/source/ami_development.rst
@@ -16,7 +16,7 @@ Steps
 
 This guide is written assuming your OS is Ubuntu 14.04. If you don't have an Ubuntu machine you can easily get an `EC2 instance <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EC2_GetStarted.html>`_ running Ubuntu. 
 
-#.	:code:`sudo apt-get install build-essential`
+#.	:code:`sudo apt-get -y install build-essential git`
 #.	Go to https://downloads.chef.io/chef-dk, grab the latest version for your OS and install.
 
 	For example:
@@ -36,6 +36,7 @@ This guide is written assuming your OS is Ubuntu 14.04. If you don't have an Ubu
 		sudo tar xf ~/go1.7.linux-amd64.tar.gz
 		echo 'export GOPATH=~/work' >> ~/.bashrc
 		echo 'export PATH=$GOPATH/bin:/usr/local/go/bin:$PATH' >> ~/.bashrc
+		. ~/.bashrc
 
 #.	Install packer from source