diff --git a/manifests/ec2-ebs-pvm.manifest.json b/manifests/ec2-ebs-pvm.manifest.json
index c81e8fb..d7a77af 100644
--- a/manifests/ec2-ebs-pvm.manifest.json
+++ b/manifests/ec2-ebs-pvm.manifest.json
@@ -8,10 +8,10 @@
 
 	"bootstrapper": {
 		"mount_dir": "/target",
-		"mirror": "http://http.debian.net/"
+		"mirror": "http://http.debian.net/debian"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
 		"description": "Debian {release} {architecture} AMI ({virtualization})"
 	},
 	"system": {