diff --git a/components/engine/Vagrantfile b/components/engine/Vagrantfile
index 36f72b907e..db52a1e1b4 100644
--- a/components/engine/Vagrantfile
+++ b/components/engine/Vagrantfile
@@ -25,7 +25,7 @@ def v10(config)
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another
   # physical device on your network.
-  # config.vm.network :bridged
+  #config.vm.network :bridged
 
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
@@ -119,7 +119,7 @@ end
     aws.keypair_name = ENV["AWS_KEYPAIR_NAME"]
     aws.ssh_private_key_path = ENV["AWS_SSH_PRIVKEY"]
     aws.region = "us-east-1"
-    aws.ami = "ami-4a7de623"
+    aws.ami = "ami-4e75ee27"
     aws.ssh_username = "ubuntu"
     aws.instance_type = "t1.micro"
   end
diff --git a/components/engine/puppet/modules/docker/manifests/init.pp b/components/engine/puppet/modules/docker/manifests/init.pp
index 6f8d249ff7..8f68435a49 100644
--- a/components/engine/puppet/modules/docker/manifests/init.pp
+++ b/components/engine/puppet/modules/docker/manifests/init.pp
@@ -1,12 +1,26 @@
 class virtualbox {
 	Package { ensure => "installed" }
 
+	user { "vagrant":
+		name => "vagrant",
+		ensure => present,
+		comment => "Vagrant User",
+		shell => "/bin/bash",
+		home => "/home/vagrant",
+	}
+
+	file { "/home/vagrant":
+		mode => 644,
+		require => User["vagrant"],
+	}
+
 	# remove some files from the base vagrant image because they're old
 	file { "/home/vagrant/docker-master":
 		ensure => absent,
 		recurse => true,
 		force => true,
 		purge => true,
+		require => File["/home/vagrant"],
 	}
 	file { "/usr/local/bin/dockerd":
 		ensure => absent,
@@ -23,10 +37,21 @@ class virtualbox {
 }
 
 class ec2 {
+	user { "vagrant":
+		name => "ubuntu",
+		ensure => present,
+		comment => "Vagrant User",
+		shell => "/bin/bash",
+		home => "/home/ubuntu",
+	}
+	file { "/home/vagrant":
+		ensure => link,
+		target => "/home/ubuntu",
+		require => User["vagrant"],
+	}
 }
 
 class docker {
-
     # update this with latest docker binary distro
     $docker_url = "http://get.docker.io/builds/$kernel/$hardwaremodel/docker-master.tgz"
     # update this with latest go binary distry
@@ -44,19 +69,14 @@ class docker {
 
 	$ec2_version = file("/etc/ec2_version", "/dev/null")
 	if ($ec2_version) {
+		$vagrant_user = "ubuntu"
 		include ec2
 	} else {
+		$vagrant_user = "vagrant"
 		# virtualbox is the vagrant default, so it should be safe to assume
 		include virtualbox
 	}
 
-    user { "vagrant":
-        ensure => present,
-        comment => "Vagrant User",
-        shell => "/bin/bash",
-        home => "/home/vagrant",
-    }
-
 	file { "/usr/local/bin":
 		ensure => directory,
 		owner => root,
@@ -83,14 +103,10 @@ class docker {
         require => Exec["copy-docker-bin"],
     }
 
-    file { "/home/vagrant":
-        mode => 644,
-        require => User["vagrant"],
-    }
 
     file { "/home/vagrant/.profile":
         mode => 644,
-        owner => "vagrant",
+        owner => $vagrant_user,
         group => "ubuntu",
         content => template("docker/profile"),
         require => File["/home/vagrant"],