diff --git a/bundles/raspberrypi/files/config.txt b/bundles/raspberrypi/files/config.txt
index 00079b2..445fc63 100644
--- a/bundles/raspberrypi/files/config.txt
+++ b/bundles/raspberrypi/files/config.txt
@@ -12,6 +12,7 @@ gpu_mem=${node.metadata['raspberrypi'].get('gpu_mem', 128)}
 % if node.os == 'debian':
 arm_64bit=1
 % endif
+arm_boost=1
 
 % for item in sorted(node.metadata['raspberrypi'].get('config.txt', set())):
 ${item}
diff --git a/bundles/raspberrypi/items.py b/bundles/raspberrypi/items.py
index aab459a..41f5544 100644
--- a/bundles/raspberrypi/items.py
+++ b/bundles/raspberrypi/items.py
@@ -15,11 +15,11 @@ actions = {
 }
 
 files = {
-    '/boot/cmdline.txt': {
+    '/boot/firmware/cmdline.txt': {
         'content': ' '.join(sorted(node.metadata['raspberrypi']['cmdline'])),
         **file_perms,
     },
-    '/boot/config.txt': {
+    '/boot/firmware/config.txt': {
         'content_type': 'mako',
         'context': node.metadata['raspberrypi'],
         **file_perms,
diff --git a/bundles/raspberrypi/metadata.py b/bundles/raspberrypi/metadata.py
index a4c10c2..5c8f42a 100644
--- a/bundles/raspberrypi/metadata.py
+++ b/bundles/raspberrypi/metadata.py
@@ -1,5 +1,6 @@
 defaults = {
     'apt': {
+        'clean_old_kernels': False,
         'packages': {
             'dhcpcd5': {
                 'installed': False,
@@ -14,6 +15,14 @@ defaults = {
                 'installed': False,
             },
         },
+        'repos': {
+            'raspi': {
+                'install_gpg_key': False,
+                'items': {
+                    'deb http://archive.raspberrypi.org/debian/ {os_release} main',
+                },
+            },
+        },
     },
     'raspberrypi': {
         'default-target': 'multi-user.target',