diff --git a/manifests/official/ec2/ebs-jessie-amd64-hvm.yml b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml
index 7f8f338..7ff2faf 100644
--- a/manifests/official/ec2/ebs-jessie-amd64-hvm.yml
+++ b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml
@@ -13,20 +13,45 @@ bootstrapper:
 system:
   release: jessie
   architecture: amd64
-  bootloader: extlinux
+  bootloader: grub
   charmap: UTF-8
   locale: en_US
   timezone: UTC
 volume:
   backing: ebs
   partitions:
-    type: none
+    type: gpt
     root:
       filesystem: ext4
       size: 8GiB
 packages:
   mirror: http://cloudfront.debian.net/debian
+  components:
+  - main
+  - contrib
+  - non-free
+  preferences:
+    backport-cloud-init-cloud-utils:
+    - package: cloud-init cloud-utils
+      pin: release n=jessie-backports
+      pin-priority: 500
+  install:
+  - awscli
+  - python-boto
+  - python3-boto
+  - apt-transport-https
+  - lvm2
+  - ncurses-term
+  - parted
+  - cloud-init
+  - cloud-utils
+  - gdisk
+  - systemd
+  - systemd-sysv
 plugins:
   cloud_init:
     metadata_sources: Ec2
     username: admin
+    enable_modules:
+      cloud_init_modules:
+      - { module: growpart, position: 4}