diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json
index 43806d2..45c726c 100644
--- a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json
+++ b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json
@@ -10,8 +10,8 @@
 		"workspace": "/target"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} AMI ({virtualization})"
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs",
+		"description": "Debian {release} {architecture}"
 	},
 	"system": {
 		"release":      "wheezy",
diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json
index b5094e7..9631562 100644
--- a/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json
+++ b/manifests/ec2-ebs-debian-official-amd64-pvm.manifest.json
@@ -10,8 +10,8 @@
 		"workspace": "/target"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} AMI ({virtualization})"
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs",
+		"description": "Debian {release} {architecture}"
 	},
 	"system": {
 		"release":      "wheezy",
diff --git a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
index 285d3e5..e44cfe6 100644
--- a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
+++ b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
@@ -10,8 +10,8 @@
 		"workspace": "/target"
 	},
 	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} AMI ({virtualization})"
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}-{%m}-{%d}-ebs",
+		"description": "Debian {release} {architecture}"
 	},
 	"system": {
 		"release":      "wheezy",